Merge branch 'clk-omap-legacy' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Fri, 30 Jan 2015 18:57:21 +0000 (10:57 -0800)
committerMichael Turquette <mturquette@linaro.org>
Mon, 2 Feb 2015 22:23:33 +0000 (14:23 -0800)
commitfe767560523d7556cb11fef466adf4b10141d73b
treed70e4a3b6539f21eb675adce10ad965b95ed4dfe
parent035a61c314eb3dab5bcc5683afaf4d412689858a
parentd6540b1937192271a11ee02c3d197ddc39090257
Merge branch 'clk-omap-legacy' into clk-next

Conflicts:
arch/arm/mach-omap2/cclock3xxx_data.c
drivers/clk/ti/Makefile
include/linux/clk/ti.h