Merge branch 'topic/hda' into for-next

author Takashi Iwai <tiwai@suse.de>

Mon, 16 Nov 2009 11:05:16 +0000 (12:05 +0100)

committer Takashi Iwai <tiwai@suse.de>

Mon, 16 Nov 2009 11:05:16 +0000 (12:05 +0100)
author Takashi Iwai <tiwai@suse.de>
Mon, 16 Nov 2009 11:05:16 +0000 (12:05 +0100)
committer Takashi Iwai <tiwai@suse.de>
Mon, 16 Nov 2009 11:05:16 +0000 (12:05 +0100)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 16 Nov 2009 11:05:16 +0000 (12:05 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 16 Nov 2009 11:05:16 +0000 (12:05 +0100)