]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 15:35:16 +0000 (17:35 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 15:35:16 +0000 (17:35 +0200)
commita68bbab7373178a577980c04b0efd0f4f44a1a26
treebb4b4b1664fa45d4823778efa57bf677b378837c
parentaa5c076bbd1344976d7dfda37f23c011e6c6c29e
parentbe2c0adfc23f5f4664592cc3b700d88d5570ba52
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc

Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/powerdomain.h
arch/arm/mach-omap2/voltage.h