Merge remote-tracking branch 'linaro/clk-next' into clk-next
authorMike Turquette <mturquette@linaro.org>
Thu, 16 Jan 2014 21:13:46 +0000 (13:13 -0800)
committerMike Turquette <mturquette@linaro.org>
Thu, 16 Jan 2014 21:13:46 +0000 (13:13 -0800)

Trivial merge