Merge branch 'for-3.4/soc' into for-3.4/t30-smp