Merge branch 'ux500/cleanup' into next/drivers