Merge branch 'clk-pxa27x' into clk-next
authorMike Turquette <mturquette@linaro.org>
Tue, 30 Sep 2014 19:49:42 +0000 (12:49 -0700)
committerMike Turquette <mturquette@linaro.org>
Tue, 30 Sep 2014 19:49:42 +0000 (12:49 -0700)

Trivial merge