Merge branch 'fix/hda' into for-linus

author Takashi Iwai <tiwai@suse.de>

Tue, 13 Oct 2009 14:09:56 +0000 (16:09 +0200)

committer Takashi Iwai <tiwai@suse.de>

Tue, 13 Oct 2009 14:09:56 +0000 (16:09 +0200)
author Takashi Iwai <tiwai@suse.de>
Tue, 13 Oct 2009 14:09:56 +0000 (16:09 +0200)
committer Takashi Iwai <tiwai@suse.de>
Tue, 13 Oct 2009 14:09:56 +0000 (16:09 +0200)
diff --cc Documentation/sound/alsa/HD-Audio-Models.txt
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Tue, 13 Oct 2009 14:09:56 +0000 (16:09 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 13 Oct 2009 14:09:56 +0000 (16:09 +0200)