From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 2 Mar 2012 13:05:00 +0000 (+0000)
Subject: Merge branch 'depends/omap/gpio/runtime-pm-cleanup' into next/cleanup
X-Git-Tag: v3.4-rc1~91^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1220547bfd7f7dd97f770a04b533323e5404b8e9;p=pandora-kernel.git

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>
---

1220547bfd7f7dd97f770a04b533323e5404b8e9
Reading git-diff-tree failed