diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 17:27:43 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 17:27:43 -0600 |
| commit | 4fb85d35bcec842e0f20437aea277157973aa45f (patch) | |
| tree | d3b865af2f4066f68828806b231e4bb5b4de9ec8 /arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | |
| parent | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d (diff) | |
| parent | a86c0b9867940bd0ba78f109686079b4051a463d (diff) | |
| download | op-kernel-dev-4fb85d35bcec842e0f20437aea277157973aa45f.zip op-kernel-dev-4fb85d35bcec842e0f20437aea277157973aa45f.tar.gz | |
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
Diffstat (limited to 'arch/arm/mach-omap2/powerdomain2xxx_3xxx.c')
0 files changed, 0 insertions, 0 deletions
