Merge branch 'fix/asoc' into for-next

diff --cc sound/soc/atmel/sam9g20_wm8731.c
Simple merge

diff --cc sound/soc/atmel/snd-soc-afeb9260.c
Simple merge

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

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

diff --cc sound/soc/imx/phycore-ac97.c
Simple merge

diff --cc sound/soc/omap/osk5912.c
Simple merge