Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sta32x', 'asoc/topic...

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

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

diff --cc sound/soc/fsl/eukrea-tlv320.c
Simple merge

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge

diff --cc sound/soc/fsl/wm1133-ev1.c
Simple merge

diff --cc sound/soc/generic/simple-card.c
Simple merge

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