Merge branch 'fix/hda' into topic/hda

author Takashi Iwai <tiwai@suse.de>

Mon, 2 May 2011 08:41:40 +0000 (10:41 +0200)

committer Takashi Iwai <tiwai@suse.de>

Mon, 2 May 2011 08:41:40 +0000 (10:41 +0200)
author Takashi Iwai <tiwai@suse.de>
Mon, 2 May 2011 08:41:40 +0000 (10:41 +0200)
committer Takashi Iwai <tiwai@suse.de>
Mon, 2 May 2011 08:41:40 +0000 (10:41 +0200)
diff --cc sound/pci/hda/hda_codec.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge
diff --cc sound/pci/hda/patch_via.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 2 May 2011 08:41:40 +0000 (10:41 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 2 May 2011 08:41:40 +0000 (10:41 +0200)
		1	2
sound/pci/hda/hda_codec.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_sigmatel.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_via.c	patch \|	diff1 \|	diff2 \|	blob \| history