]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
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)
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>

Trivial merge