Merge branch 'depends/clk-for-3.10' into next/cleanup