Merge branch 'fix/hda' into topic/hda

author Takashi Iwai <tiwai@suse.de>

Fri, 23 Jan 2009 07:07:51 +0000 (08:07 +0100)

committer Takashi Iwai <tiwai@suse.de>

Fri, 23 Jan 2009 07:07:51 +0000 (08:07 +0100)
author Takashi Iwai <tiwai@suse.de>
Fri, 23 Jan 2009 07:07:51 +0000 (08:07 +0100)
committer Takashi Iwai <tiwai@suse.de>
Fri, 23 Jan 2009 07:07:51 +0000 (08:07 +0100)
diff --cc Documentation/sound/alsa/HD-Audio-Models.txt
Simple merge
diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Fri, 23 Jan 2009 07:07:51 +0000 (08:07 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Fri, 23 Jan 2009 07:07:51 +0000 (08:07 +0100)
		1	2
Documentation/sound/alsa/HD-Audio-Models.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_sigmatel.c	patch \|	diff1 \|	diff2 \|	blob \| history