Merge remote-tracking branch 'linaro/clk-next' into clk-next
authorMike Turquette <mturquette@linaro.org>
Fri, 23 May 2014 21:30:35 +0000 (14:30 -0700)
committerMike Turquette <mturquette@linaro.org>
Fri, 23 May 2014 21:30:35 +0000 (14:30 -0700)

Trivial merge