Merge branch 'clk-next-shmobile' into clk-next