Merge branch 'clk-shmobile-for-4.2' into base