Merge branch 'ux500/fixes-3.5' into next/dt