Merge remote-tracking branch 'clk/clk-for-3.10' into sunxi/core-for-3.10