Merge branch 'clk-for-v4.3' into dt-for-v4.3