Skip to content
GitLab
Commit 49c4a4c5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Conflicts:
	sound/pci/emu10k1/emu10k1_main.c

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 1962fcab 7241ea55
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment