projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a26d3c4 f86bcc3)
Merge branch 'depends/omap/gpio/runtime-pm-cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Mar 2012 13:05:00 +0000 (13:05 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 2 Mar 2012 13:05:00 +0000 (13:05 +0000)
commit1220547bfd7f7dd97f770a04b533323e5404b8e9
treea4231b9570f3302f032a2d757fb3af24a4238d46tree | snapshot
parenta26d3c4fcd4bb875ae5adc32f27fab7a478bb00dcommit | diff
parentf86bcc302a8c570dd0f5a50097a6af96a0e717c2commit | 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>
arch/arm/mach-omap1/gpio16xx.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/pm34xx.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;