Merge branch 'topic/snd_card_new-err' into topic/atmel

author Takashi Iwai <tiwai@suse.de>

Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)

committer Takashi Iwai <tiwai@suse.de>

Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)
author Takashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)
committer Takashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/ppc/snd_ps3.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/usb/caiaq/caiaq-device.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)
		1	2
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/ppc/snd_ps3.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/caiaq/caiaq-device.c	patch \|	diff1 \|	diff2 \|	blob \| history