Merge branch 'fix/hda' into topic/hda

author Takashi Iwai <tiwai@suse.de>

Tue, 20 Sep 2011 07:14:04 +0000 (09:14 +0200)

committer Takashi Iwai <tiwai@suse.de>

Tue, 20 Sep 2011 07:14:04 +0000 (09:14 +0200)
author Takashi Iwai <tiwai@suse.de>
Tue, 20 Sep 2011 07:14:04 +0000 (09:14 +0200)
committer Takashi Iwai <tiwai@suse.de>
Tue, 20 Sep 2011 07:14:04 +0000 (09:14 +0200)
diff --cc sound/pci/hda/hda_codec.c
Simple merge
diff --cc sound/pci/hda/patch_conexant.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Tue, 20 Sep 2011 07:14:04 +0000 (09:14 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 20 Sep 2011 07:14:04 +0000 (09:14 +0200)
		1	2
sound/pci/hda/hda_codec.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_conexant.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history