Merge branch 'fix/asoc' into for-linus

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

diff --cc sound/soc/imx/imx-pcm-dma-mx2.c
Simple merge

diff --cc sound/soc/imx/imx-pcm-fiq.c
Simple merge

diff --cc sound/soc/imx/imx-ssi.c
Simple merge