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
This commit is contained in:
Paul Walmsley 2012-09-23 17:27:43 -06:00
commit 4fb85d35bc
28 changed files with 762 additions and 227 deletions