Merge branch 'topic/snd_card_new-err' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:35 +0000 (00:35 +0100)]
13 files changed:
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/isa/opl3sa2.c
sound/pci/aw2/aw2-alsa.c
sound/pci/hda/hda_intel.c
sound/pci/intel8x0.c
sound/pci/mixart/mixart.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
Simple merge
Simple merge
Simple merge