Merge branch 'topic/snd_card_new-err' into topic/atmel
Takashi Iwai [Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)]
1  2 
sound/pci/hda/hda_intel.c
sound/ppc/snd_ps3.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c

Simple merge
Simple merge
Simple merge
Simple merge