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

diff --cc sound/pci/hda/hda_intel.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