Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai

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

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

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

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