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

author Takashi Iwai <tiwai@suse.de>

Tue, 30 Jun 2009 13:29:38 +0000 (15:29 +0200)

committer Takashi Iwai <tiwai@suse.de>

Tue, 30 Jun 2009 13:29:38 +0000 (15:29 +0200)
author Takashi Iwai <tiwai@suse.de>
Tue, 30 Jun 2009 13:29:38 +0000 (15:29 +0200)
committer Takashi Iwai <tiwai@suse.de>
Tue, 30 Jun 2009 13:29:38 +0000 (15:29 +0200)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
diff --cc Documentation/sound/alsa/HD-Audio.txt
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Tue, 30 Jun 2009 13:29:38 +0000 (15:29 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 30 Jun 2009 13:29:38 +0000 (15:29 +0200)
		1	2
Documentation/sound/alsa/ALSA-Configuration.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/sound/alsa/HD-Audio.txt	patch \|	diff1 \|	diff2 \|	blob \| history