From: Mike Turquette <mturquette@linaro.org>
Date: Wed, 28 Aug 2013 01:07:46 +0000 (-0700)
Subject: Merge tag 'sunxi-clk-for-3.12' of https://github.com/mripard/linux into clk-next... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c045ddeb3893c4614e6ab694b8d297e3badc23af;p=deliverable%2Flinux.git

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
---

c045ddeb3893c4614e6ab694b8d297e3badc23af