]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfa6a49d8566801d7afe26747ab02ba4a307b71b3
treed3b865af2f4066f68828806b231e4bb5b4de9ec8
parentdf661a72de7a7f97d0a82ecc653fa76a654bc5cd
parent96f8f2927df8a76c80e1e46ecd94963b5a3952bc
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