Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next

diff --cc include/sound/soc-dapm.h
Simple merge

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

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

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

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

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

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

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

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