| commit | 1220547bfd7f7dd97f770a04b533323e5404b8e9 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Mar 02 13:05:00 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Mar 02 13:05:00 2012 +0000 |
| tree | a4231b9570f3302f032a2d757fb3af24a4238d46 | |
| parent | a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d [diff] | |
| parent | f86bcc302a8c570dd0f5a50097a6af96a0e717c2 [diff] |
Merge branch 'depends/omap/gpio/runtime-pm-cleanup' into next/cleanup Conflicts: arch/arm/mach-omap1/gpio16xx.c drivers/gpio/gpio-omap.c Merge in the runtime-pm-cleanup branch from the gpio tree into next/cleanup, this resolves a nonobvious merge conflict between the two branches. Both branches move parts of the gpio-omap driver into platform code, this takes the superset of both changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>