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

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

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

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