Merge branch 'clk-fixes' into clk-next
authorMike Turquette <mturquette@linaro.org>
Wed, 28 May 2014 07:15:10 +0000 (00:15 -0700)
committerMike Turquette <mturquette@linaro.org>
Wed, 28 May 2014 07:15:10 +0000 (00:15 -0700)

Trivial merge