diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 19:19:05 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 19:20:07 +0400 |
| commit | f4e2467bad53023589cbff18dd1ab6e0aa3f004c (patch) | |
| tree | 8d7abbf418eabd25bbcdc9b6de2f8216d2eaa616 /arch/arm/mach-omap2/pm.h | |
| parent | e3643b77de143c5548ec93abd8aa68f4123295ea (diff) | |
| parent | a6de3df4f172e124280d88e617ee7d29f7af970b (diff) | |
| download | linux-f4e2467bad53023589cbff18dd1ab6e0aa3f004c.tar.xz | |
Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup
* 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6:
ep93xx: Remove unnecessary includes of ep93xx-regs.h
ep93xx: Move EP93XX_SYSCON defines to SoC private header
ep93xx: Move crunch code to mach-ep93xx directory
ep93xx: Make syscon access functions private to SoC
ep93xx: Configure GPIO ports in core code
ep93xx: Move peripheral defines to local SoC header
ep93xx: Convert the watchdog driver into a platform device.
ep93xx: Use ioremap for backlight driver
ep93xx: Move GPIO defines to gpio-ep93xx.h
ep93xx: Don't use system controller defines in audio drivers
ep93xx: Move PHYS_BASE defines to local SoC header file
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-s3c2440/common.h
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
0 files changed, 0 insertions, 0 deletions