Merge tag 'sunxi-clk-for-3.12' of https://github.com/mripard/linux into clk-next...
authorMike Turquette <mturquette@linaro.org>
Wed, 28 Aug 2013 01:07:46 +0000 (18:07 -0700)
committerMike Turquette <mturquette@linaro.org>
Wed, 28 Aug 2013 01:07:46 +0000 (18:07 -0700)
Allwinner clock changes for 3.12

These patches mostly do some cleanup to introduce the basic gated clocks for
the Allwinner A10s, A20 and A31 SoCs.

Conflicts:
drivers/clk/sunxi/clk-sunxi.c


Trivial merge