Merge branch 'topic/hda' into for-linus

author Takashi Iwai <tiwai@suse.de>

Fri, 4 Dec 2009 15:22:45 +0000 (16:22 +0100)

committer Takashi Iwai <tiwai@suse.de>

Fri, 4 Dec 2009 15:22:45 +0000 (16:22 +0100)
author Takashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:45 +0000 (16:22 +0100)
committer Takashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:45 +0000 (16:22 +0100)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
diff --cc sound/pci/ice1712/ice1712.h
Simple merge
diff --cc sound/pci/ice1712/juli.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Fri, 4 Dec 2009 15:22:45 +0000 (16:22 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Fri, 4 Dec 2009 15:22:45 +0000 (16:22 +0100)
		1	2
Documentation/sound/alsa/ALSA-Configuration.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/ice1712/ice1712.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/ice1712/juli.c	patch \|	diff1 \|	diff2 \|	blob \| history