Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1', 'hwmod_dss_fix_3...

author Paul Walmsley <paul@pwsan.com>

Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)

committer Paul Walmsley <paul@pwsan.com>

Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)
author Paul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)
committer Paul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)
diff --cc arch/arm/mach-omap2/clock44xx_data.c
Simple merge
diff --cc arch/arm/mach-omap2/powerdomains44xx_data.c
Simple merge
author	Paul Walmsley <paul@pwsan.com>
	Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)
committer	Paul Walmsley <paul@pwsan.com>
	Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)
		1	2	3
arch/arm/mach-omap2/clock44xx_data.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mach-omap2/powerdomains44xx_data.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history