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

author Takashi Iwai <tiwai@suse.de>

Fri, 19 Dec 2008 07:25:46 +0000 (08:25 +0100)

committer Takashi Iwai <tiwai@suse.de>

Fri, 19 Dec 2008 07:25:46 +0000 (08:25 +0100)
author Takashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 07:25:46 +0000 (08:25 +0100)
committer Takashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 07:25:46 +0000 (08:25 +0100)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Fri, 19 Dec 2008 07:25:46 +0000 (08:25 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Fri, 19 Dec 2008 07:25:46 +0000 (08:25 +0100)