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 <[email protected]>

Author: tiwai