Merge branch 'clk-rockchip' into clk-next
authorMike Turquette <mturquette@linaro.org>
Thu, 24 Jul 2014 02:41:39 +0000 (19:41 -0700)
committerMike Turquette <mturquette@linaro.org>
Thu, 24 Jul 2014 02:41:39 +0000 (19:41 -0700)

Trivial merge