Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/topology'...

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

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

diff --cc include/uapi/sound/asoc.h
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

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