Merge remote-tracking branch 'linaro/clk-next' into clk-next
authorMike Turquette <mturquette@linaro.org>
Wed, 2 Jul 2014 02:59:52 +0000 (19:59 -0700)
committerMike Turquette <mturquette@linaro.org>
Wed, 2 Jul 2014 02:59:52 +0000 (19:59 -0700)

Trivial merge