From: Mike Turquette <mturquette@linaro.org>
Date: Sun, 1 Dec 2013 20:42:45 +0000 (-0800)
Subject: Merge tag 'sunxi-clk-for-3.13' of https://github.com/mripard/linux into clk-next... 
X-Git-Tag: v3.14-rc1~109^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d9438f7b560862fd0832355b4ad199b30e67478;p=pandora-kernel.git

Merge tag 'sunxi-clk-for-3.13' of https://github.com/mripard/linux into clk-next-sunxi-rebase

Allwinner sunXi SoCs clock changes

Those are mostly random fixes, except for one patch to the composite
clock that adds support for automatic reparenting.

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

1d9438f7b560862fd0832355b4ad199b30e67478
Reading git-diff-tree failed