Merge remote-tracking branch 'linaro_mturquette_linux/clk-for-3.10' into for-3.10/clk