Merge branch 'clk-omap-legacy' into clk-next

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c
This commit is contained in:
Michael Turquette 2015-01-30 10:57:21 -08:00
commit fe76756052
16 changed files with 5548 additions and 3810 deletions