Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'omap4_clo...

author Paul Walmsley <paul@pwsan.com>

Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)

committer Paul Walmsley <paul@pwsan.com>

Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)
author Paul Walmsley <paul@pwsan.com>
Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)
committer Paul Walmsley <paul@pwsan.com>
Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)
diff --cc arch/arm/mach-omap2/clock44xx_data.c
Simple merge
author	Paul Walmsley <paul@pwsan.com>
	Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)
committer	Paul Walmsley <paul@pwsan.com>
	Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)