Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap...

author Tony Lindgren <tony@atomide.com>

Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)

committer Tony Lindgren <tony@atomide.com>

Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
author Tony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
committer Tony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
diff --cc arch/arm/mach-omap2/Makefile
Simple merge
diff --cc arch/arm/mach-omap2/io.c
Simple merge
diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge
diff --cc arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
		1	2
arch/arm/mach-omap2/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/io.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/omap_hwmod.h	patch \|	diff1 \|	diff2 \|	blob \| history