Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'omap4_clo...
authorPaul Walmsley <paul@pwsan.com>
Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)
committerPaul Walmsley <paul@pwsan.com>
Mon, 5 Sep 2011 02:21:16 +0000 (20:21 -0600)

Trivial merge