From: Paul Walmsley <paul@pwsan.com>
Date: Mon, 5 Sep 2011 02:21:16 +0000 (-0600)
Subject: Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'omap4_clo... 
X-Git-Tag: v3.1-rc6~2^2~2^2
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=876355014ce3a7ba8ca299522b215365b4a3fb61;p=sfrench%2Fcifs-2.6.git

Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'omap4_clock_fixes_3.1rc', 'missing_2430_musb_adds_terminator_fix_3.1rc' and 'pwrdm_clkdm_fixes_3.1rc' into prcm-fixes-a-3.1rc
---

876355014ce3a7ba8ca299522b215365b4a3fb61