Merge branch 'clk-next-mmp' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Fri, 14 Nov 2014 01:20:39 +0000 (17:20 -0800)
committerMichael Turquette <mturquette@linaro.org>
Fri, 14 Nov 2014 01:20:39 +0000 (17:20 -0800)

Trivial merge