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)
commitc045ddeb3893c4614e6ab694b8d297e3badc23af
tree6e13aa83c08809b9d082511b43270da8d11551e5
parentaa514ce34b65e3dc01f95a0b470b39bbb7e09998
parent1fb2e4aab8b31b15e6be5debacb4203333360fd2
Merge tag 'sunxi-clk-for-3.12' of https://github.com/mripard/linux into clk-next-sunxi

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