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