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