Merge remote-tracking branch 'asoc/fix/ux500' into asoc-linus