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

Merge branch 'test/hda-jack' into topic/hda 

Conflicts:
	sound/pci/hda/patch_hdmi.c
	sound/pci/hda/patch_via.c
parents db9c6f84 31ef2257
Hide whitespace changes
Inline Side-by-side
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