Merge branch 'topic/hda-cirrus' into topic/hda

author Takashi Iwai <tiwai@suse.de>

Thu, 30 Jul 2009 16:09:04 +0000 (18:09 +0200)

committer Takashi Iwai <tiwai@suse.de>

Thu, 30 Jul 2009 16:09:04 +0000 (18:09 +0200)
author Takashi Iwai <tiwai@suse.de>
Thu, 30 Jul 2009 16:09:04 +0000 (18:09 +0200)
committer Takashi Iwai <tiwai@suse.de>
Thu, 30 Jul 2009 16:09:04 +0000 (18:09 +0200)
diff --cc Documentation/sound/alsa/HD-Audio-Models.txt
Simple merge
diff --cc sound/pci/hda/hda_codec.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Thu, 30 Jul 2009 16:09:04 +0000 (18:09 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Thu, 30 Jul 2009 16:09:04 +0000 (18:09 +0200)
		1	2
Documentation/sound/alsa/HD-Audio-Models.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	patch \|	diff1 \|	diff2 \|	blob \| history