Merge remote-tracking branch 'linaro/clk-next' into clk-next