Merge branch 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes

author Tony Lindgren <[email protected]>

Sat, 5 Nov 2011 00:39:41 +0000 (17:39 -0700)

committer Tony Lindgren <[email protected]>

Sat, 5 Nov 2011 00:39:41 +0000 (17:39 -0700)
author Tony Lindgren <[email protected]>
Sat, 5 Nov 2011 00:39:41 +0000 (17:39 -0700)
committer Tony Lindgren <[email protected]>
Sat, 5 Nov 2011 00:39:41 +0000 (17:39 -0700)
diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge
author	Tony Lindgren <[email protected]>
	Sat, 5 Nov 2011 00:39:41 +0000 (17:39 -0700)
committer	Tony Lindgren <[email protected]>
	Sat, 5 Nov 2011 00:39:41 +0000 (17:39 -0700)