Merge branch 'clk-next-shmobile' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Tue, 18 Nov 2014 23:11:52 +0000 (15:11 -0800)
committerMichael Turquette <mturquette@linaro.org>
Wed, 19 Nov 2014 19:41:19 +0000 (11:41 -0800)

Trivial merge