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

Merge branch 'topic/fix/hda' into topic/hda 

Conflicts:
	sound/pci/hda/patch_sigmatel.c
parents 127e82e3 c39555d6
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