Merge branch 'clk-shmobile-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel...
authorMichael Turquette <mturquette@linaro.org>
Tue, 27 Jan 2015 19:34:41 +0000 (11:34 -0800)
committerMichael Turquette <mturquette@linaro.org>
Tue, 27 Jan 2015 19:34:41 +0000 (11:34 -0800)

Trivial merge