Merge branch 'topic/snd_card_new-err' into topic/oxygen

diff --cc drivers/media/video/em28xx/em28xx-audio.c
Simple merge

diff --cc drivers/media/video/saa7134/saa7134-alsa.c
Simple merge

diff --cc sound/arm/aaci.c
Simple merge

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

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

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

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

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

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

diff --cc sound/usb/usbaudio.c
Simple merge