diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-03 19:52:02 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-03 19:52:02 +0200 |
| commit | 8a94febc21743fe121bdaf1d1470d98b1135acc2 (patch) | |
| tree | ee8aaf0e2116aa0e01d4cc8260cf9930212a1ef0 | |
| parent | ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention (diff) | |
| parent | ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep (diff) | |
| parent | ARM: OMAP4: hwmod data: temporarily comment out data for the sl2if IP block (diff) | |
| download | linux-8a94febc21743fe121bdaf1d1470d98b1135acc2.tar.xz linux-8a94febc21743fe121bdaf1d1470d98b1135acc2.zip | |
Merge branches 'clkdev_fixes_3.6rc', 'clkdm_fixes_3.6rc' and 'hwmod_data_fixes_a_3.6rc' into omap_fixes_a_3.6rc