Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7
authorPaul Walmsley <paul@pwsan.com>
Sun, 23 Sep 2012 23:27:43 +0000 (17:27 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sun, 23 Sep 2012 23:27:43 +0000 (17:27 -0600)
commit4fb85d35bcec842e0f20437aea277157973aa45f
treed3b865af2f4066f68828806b231e4bb5b4de9ec8
parent1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d
parenta86c0b9867940bd0ba78f109686079b4051a463d
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
arch/arm/mach-omap2/clkt34xx_dpll3m2.c
arch/arm/mach-omap2/clkt_clksel.c
arch/arm/mach-omap2/clkt_dpll.c
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock3xxx.c
arch/arm/mach-omap2/dpll3xxx.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/pm.c
arch/arm/plat-omap/omap_device.c