Merge branch 'fix/hda' into topic/hda

author Takashi Iwai <[email protected]>

Thu, 5 Nov 2009 07:56:20 +0000 (08:56 +0100)

committer Takashi Iwai <[email protected]>

Thu, 5 Nov 2009 07:56:20 +0000 (08:56 +0100)
author Takashi Iwai <[email protected]>
Thu, 5 Nov 2009 07:56:20 +0000 (08:56 +0100)
committer Takashi Iwai <[email protected]>
Thu, 5 Nov 2009 07:56:20 +0000 (08:56 +0100)
diff --cc Documentation/sound/alsa/HD-Audio-Models.txt
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
author	Takashi Iwai <[email protected]>
	Thu, 5 Nov 2009 07:56:20 +0000 (08:56 +0100)
committer	Takashi Iwai <[email protected]>
	Thu, 5 Nov 2009 07:56:20 +0000 (08:56 +0100)
		1	2
Documentation/sound/alsa/HD-Audio-Models.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history