Merge branch 'clk-fixes' into clk-next
authorMike Turquette <mturquette@linaro.org>
Tue, 25 Feb 2014 07:07:53 +0000 (23:07 -0800)
committerMike Turquette <mturquette@linaro.org>
Tue, 25 Feb 2014 07:07:53 +0000 (23:07 -0800)

Trivial merge