Merge branch 'ux500/delete-u5500' into next/soc