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

author Takashi Iwai <tiwai@suse.de>

Mon, 27 Oct 2008 07:36:48 +0000 (08:36 +0100)

committer Takashi Iwai <tiwai@suse.de>

Mon, 27 Oct 2008 07:36:48 +0000 (08:36 +0100)
author Takashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2008 07:36:48 +0000 (08:36 +0100)
committer Takashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2008 07:36:48 +0000 (08:36 +0100)
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 27 Oct 2008 07:36:48 +0000 (08:36 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 27 Oct 2008 07:36:48 +0000 (08:36 +0100)
		1	2
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_sigmatel.c	patch \|	diff1 \|	diff2 \|	blob \| history