Merge branch 'fix/hda' into topic/hda

author Takashi Iwai <[email protected]>

Mon, 16 Nov 2009 10:33:35 +0000 (11:33 +0100)

committer Takashi Iwai <[email protected]>

Mon, 16 Nov 2009 10:33:35 +0000 (11:33 +0100)
author Takashi Iwai <[email protected]>
Mon, 16 Nov 2009 10:33:35 +0000 (11:33 +0100)
committer Takashi Iwai <[email protected]>
Mon, 16 Nov 2009 10:33:35 +0000 (11:33 +0100)
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge
author	Takashi Iwai <[email protected]>
	Mon, 16 Nov 2009 10:33:35 +0000 (11:33 +0100)
committer	Takashi Iwai <[email protected]>
	Mon, 16 Nov 2009 10:33:35 +0000 (11:33 +0100)
		1	2
sound/pci/hda/hda_intel.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