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

Merge branch 'for-linus' into for-next 



Conflicts:
	sound/hda/hdac_i915.c

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 86c8dd7f f03b24a8
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