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