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

Merge branch 'for-linus' into for-next 

Conflicts:
	sound/pci/hda/hda_intel.c
parents d5471e67 e4d9e513
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