Merge branch 'clk-next-shmobile' into clk-next
authorMike Turquette <mturquette@linaro.org>
Fri, 13 Dec 2013 03:29:03 +0000 (19:29 -0800)
committerMike Turquette <mturquette@linaro.org>
Fri, 13 Dec 2013 03:29:03 +0000 (19:29 -0800)

Trivial merge