Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

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

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

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

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