Merge branch 'topic/snd_card_new-err' into topic/drop-l3

diff --cc sound/arm/sa11xx-uda1341.c
Simple merge

diff --cc sound/drivers/mtpav.c
Simple merge

diff --cc sound/drivers/mts64.c
Simple merge

diff --cc sound/drivers/pcsp/pcsp.c
Simple merge

diff --cc sound/drivers/serial-u16550.c
Simple merge

diff --cc sound/drivers/virmidi.c
Simple merge

diff --cc sound/mips/au1x00.c
Simple merge

diff --cc sound/pci/als300.c
Simple merge

diff --cc sound/pci/azt3328.c
Simple merge

diff --cc sound/pci/ca0106/ca0106_main.c
Simple merge

diff --cc sound/pci/cs4281.c
Simple merge

diff --cc sound/pci/cs5535audio/cs5535audio.c
Simple merge

diff --cc sound/pci/ens1370.c
Simple merge

diff --cc sound/pci/es1938.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/sonicvibes.c
Simple merge

diff --cc sound/pci/via82xx.c
Simple merge

diff --cc sound/pci/via82xx_modem.c
Simple merge

diff --cc sound/ppc/snd_ps3.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/sparc/amd7930.c
Simple merge

diff --cc sound/usb/caiaq/caiaq-device.c
Simple merge