Merge branch 'topic/pcm-oss-fix' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 3 Apr 2020 07:39:18 +0000 (09:39 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 3 Apr 2020 07:39:26 +0000 (09:39 +0200)
commitb79900a4898b210f34bdbf4f7814d1bb55eadda8
tree665a9c4f4615b71f0d9ac12c9c6947565410ecd4
parentff7e06a55676931ab32db54f69189482a948c5ec
parentae769d3556644888c964635179ef192995f40793
Merge branch 'topic/pcm-oss-fix' into for-linus

An empty merge for the original fix for PCM OSS regression where the
same fix is already applied in a different form.

Signed-off-by: Takashi Iwai <tiwai@suse.de>