Merge branch 'clk-next-shmobile' into clk-next
authorMike Turquette <mturquette@linaro.org>
Tue, 14 Jan 2014 19:41:26 +0000 (11:41 -0800)
committerMike Turquette <mturquette@linaro.org>
Tue, 14 Jan 2014 19:41:26 +0000 (11:41 -0800)

Trivial merge