Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Takashi Iwai [Tue, 17 Mar 2009 16:57:37 +0000 (17:57 +0100)]
22 files changed:
1  2 
sound/arm/sa11xx-uda1341.c
sound/drivers/mtpav.c
sound/drivers/mts64.c
sound/drivers/pcsp/pcsp.c
sound/drivers/serial-u16550.c
sound/drivers/virmidi.c
sound/mips/au1x00.c
sound/pci/als300.c
sound/pci/azt3328.c
sound/pci/ca0106/ca0106_main.c
sound/pci/cs4281.c
sound/pci/cs5535audio/cs5535audio.c
sound/pci/ens1370.c
sound/pci/es1938.c
sound/pci/hda/hda_intel.c
sound/pci/sonicvibes.c
sound/pci/via82xx.c
sound/pci/via82xx_modem.c
sound/ppc/snd_ps3.c
sound/soc/soc-core.c
sound/sparc/amd7930.c
sound/usb/caiaq/caiaq-device.c

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