Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap...
authorTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
commit23618f7faa8fdac93d4823d0372f4101d642b8b1
tree9cdc7fb633ec7c0f24eee93a968bb799f45608e2
parentceb1c532ba6220900e61ec7073a9234661efa450
parentee7fbba63e334481049a7939b8071160824447d3
Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap-pm into voltage
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/plat-omap/include/plat/omap_hwmod.h