Merge branch 'topic/asoc' into for-linus

diff --cc include/sound/control.h
Simple merge

diff --cc include/sound/pcm.h
Simple merge

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

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

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

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

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