tree 44b49303cd73a4f9f5a9fcc874db2e57901caf8b
parent 9c5f560173a466582d91bb06f4e3d2bafb0fee5c
parent e21757a05730f03f18fbfc528a919e0205aa6a61
parent 450a37d2eca6ddf6ea8186f57a7531318df6e796
parent 10167873a415ba642aa2eee0c310ebd5a4633573
parent b1cbdb00da2ac00eb67fe277e563ff1f5093b4ba
author Paul Walmsley <paul@pwsan.com> 1315189276 -0600
committer Paul Walmsley <paul@pwsan.com> 1315189276 -0600

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