Merge branch 'topic/asoc' into for-linus

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/codecs/tlv320dac33.c
Simple merge

diff --cc sound/soc/nuc900/nuc900-pcm.c
Simple merge

diff --cc sound/soc/samsung/ac97.c
Simple merge

diff --cc sound/soc/sh/fsi.c
Simple merge