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>
This commit is contained in:
Arnd Bergmann 2013-06-20 17:35:16 +02:00
commit aee9a50c5b
7 changed files with 14 additions and 46 deletions