| commit | 4fb85d35bcec842e0f20437aea277157973aa45f | [log] [tgz] |
|---|---|---|
| author | Paul Walmsley <paul@pwsan.com> | Sun Sep 23 17:27:43 2012 -0600 |
| committer | Paul Walmsley <paul@pwsan.com> | Sun Sep 23 17:27:43 2012 -0600 |
| tree | d3b865af2f4066f68828806b231e4bb5b4de9ec8 | |
| parent | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d [diff] | |
| parent | a86c0b9867940bd0ba78f109686079b4051a463d [diff] |
Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7 Conflicts: arch/arm/mach-omap2/clkt34xx_dpll3m2.c arch/arm/mach-omap2/clkt_clksel.c arch/arm/mach-omap2/clock.c