]> git.kernelconcepts.de Git - karo-tx-linux.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)
commitaee9a50c5b9e424994a58b2aefaa499623e6786a
treebb4b4b1664fa45d4823778efa57bf677b378837c
parent58eb042889ddc8035ddb68a9c9cbd2251d1b7feb
parent8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54
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