Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2