Skip to content
Commit 9dd55cb4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge to continue fixing the OSS emulation code.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents da911b1f 900498a3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment