Skip to content
Commit aee9a50c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap/pm-voltdomain-cleanup' into next/soc 



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

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 58eb0428 8bfdfc87
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment