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

Merge branch 'fix/hda' into topic/hda 



Conflicts:
	sound/pci/hda/patch_realtek.c

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents b1e4422f 005b1076
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment