diff options
| author | Arnd Bergmann <[email protected]> | 2012-03-02 13:05:00 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2012-03-02 13:05:00 +0000 |
| commit | 1220547bfd7f7dd97f770a04b533323e5404b8e9 (patch) | |
| tree | a4231b9570f3302f032a2d757fb3af24a4238d46 /fs/jbd2/commit.c | |
| parent | Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlin... (diff) | |
| parent | gpio/omap: handle set_dataout reg capable IP on restore (diff) | |
| download | kernel-1220547bfd7f7dd97f770a04b533323e5404b8e9.tar.gz kernel-1220547bfd7f7dd97f770a04b533323e5404b8e9.zip | |
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 <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions