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

Merge branch 'fix/hda' into topic/hda 

Conflicts:
	sound/pci/hda/hda_intel.c
parents c82c8abd 38f1df27
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