Merge branch 'clk-next' into v3.19-rc7
authorMichael Turquette <mturquette@linaro.org>
Mon, 2 Feb 2015 22:59:38 +0000 (14:59 -0800)
committerMichael Turquette <mturquette@linaro.org>
Mon, 2 Feb 2015 22:59:38 +0000 (14:59 -0800)

Trivial merge