Arnd Bergmann aee9a50c5b 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>

2013-06-20 17:35:16 +02:00

11 KiB

Raw Blame History

View Raw