Merge branch 'clk-fixes' into clk-next
authorMike Turquette <mturquette@linaro.org>
Mon, 12 May 2014 23:55:33 +0000 (16:55 -0700)
committerMike Turquette <mturquette@linaro.org>
Mon, 12 May 2014 23:55:33 +0000 (16:55 -0700)

Trivial merge