Merge branch 'heads/clk-for-v3.18' into next