Merge branch 'ux500/soc' into ux500/dt