Merge branch 'depends/omap/gpio/runtime-pm-cleanup' into next/cleanup

Browse Source

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>

...

This commit is contained in:

Arnd Bergmann

2012-03-02 13:05:00 +00:00

parent a26d3c4fcd f86bcc302a

commit 1220547bfd

7 changed files with 586 additions and 729 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1175

drivers/gpio/gpio-omap.c

File diff suppressed because it is too large Load Diff