Merge branch 'clk-fixes' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Tue, 25 Nov 2014 01:45:33 +0000 (17:45 -0800)
committerMichael Turquette <mturquette@linaro.org>
Tue, 25 Nov 2014 01:45:33 +0000 (17:45 -0800)

Trivial merge