diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-09-04 20:21:16 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-09-04 20:21:16 -0600 |
| commit | 876355014ce3a7ba8ca299522b215365b4a3fb61 (patch) | |
| tree | 44b49303cd73a4f9f5a9fcc874db2e57901caf8b /arch | |
| parent | 9c5f560173a466582d91bb06f4e3d2bafb0fee5c (diff) | |
| parent | e21757a05730f03f18fbfc528a919e0205aa6a61 (diff) | |
| parent | 450a37d2eca6ddf6ea8186f57a7531318df6e796 (diff) | |
| parent | 10167873a415ba642aa2eee0c310ebd5a4633573 (diff) | |
| parent | b1cbdb00da2ac00eb67fe277e563ff1f5093b4ba (diff) | |
| download | linux-876355014ce3a7ba8ca299522b215365b4a3fb61.tar.gz linux-876355014ce3a7ba8ca299522b215365b4a3fb61.tar.bz2 linux-876355014ce3a7ba8ca299522b215365b4a3fb61.zip | |
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