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

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