tree d70e4a3b6539f21eb675adce10ad965b95ed4dfe
parent 035a61c314eb3dab5bcc5683afaf4d412689858a
parent d6540b1937192271a11ee02c3d197ddc39090257
author Michael Turquette <mturquette@linaro.org> 1422644241 -0800
committer Michael Turquette <mturquette@linaro.org> 1422915813 -0800

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

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c