Merge branch 'for-3.10/soc' into for-3.10/clk