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

Merge branch 'fix/hda' into topic/via-cleanup 

Conflicts:
	sound/pci/hda/patch_via.c
parents ada509ec e905a83a
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