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