Merge branch 'clk-fixes' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Sat, 2 May 2015 01:25:10 +0000 (18:25 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Sat, 2 May 2015 01:25:10 +0000 (18:25 -0700)

Trivial merge