diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 10:15:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 10:15:38 +0100 |
| commit | c830343a889baaedb33917f5fee228d0a5ecf465 (patch) | |
| tree | ffd103dbcdfac45e76d5fab94662d052b57b6355 /arch/arm/mach-omap2/pm.h | |
| parent | 73a0e3350cdf87d8bff28e5b721959c706f905f0 (diff) | |
| parent | 03ec7fe70c5ce850a20aabe66c88e1a39111f9dd (diff) | |
Merge tag 'pxa-for-3.19' of https://github.com/rjarzmik/linux into next/soc
Pull "arm: pxa: pxa for v3.19" from Robert Jarzmik:
This is a very quiet release, featuring a small cleanup, a tosa change
on its charger driver, and support for pxa device-tree based pxa27x
boards.
The device-tree part will only be fully activated once clocks support
is fully operation in the common clock framework.
* tag 'pxa-for-3.19' of https://github.com/rjarzmik/linux:
arm: pxa: add pxa27x device-tree support
arm: pxa: remove unnecessary includes from pxa-dt
arm: pxa: move init functions into generic.h
arm: pxa: add device-tree irq init for pxa27x
ARM: pxa: tosa: switch to gpio-charger
arm: mach-pxa: Convert pr_warning to pr_warn
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
0 files changed, 0 insertions, 0 deletions