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

Trivial merge