Merge remote-tracking branches 'asoc/topic/delay', 'asoc/topic/fsi' and 'asoc/topic...

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

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