Merge branch 'clk-next' into v4.3-rc1
authorStephen Boyd <sboyd@codeaurora.org>
Wed, 16 Sep 2015 22:20:03 +0000 (15:20 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Wed, 16 Sep 2015 22:20:03 +0000 (15:20 -0700)

Trivial merge