Merge branch 'topic/snd_card_new-err' into topic/oxygen
Takashi Iwai [Thu, 19 Feb 2009 09:22:14 +0000 (10:22 +0100)]
1  2 
drivers/media/video/em28xx/em28xx-audio.c
drivers/media/video/saa7134/saa7134-alsa.c
sound/arm/aaci.c
sound/drivers/mtpav.c
sound/pci/hda/hda_intel.c
sound/pci/intel8x0.c
sound/ppc/snd_ps3.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c
sound/usb/usbaudio.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge