Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic...

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

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

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

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

diff --cc sound/soc/intel/bytcr_dpcm_rt5640.c
Simple merge

diff --cc sound/soc/intel/sst-firmware.c
Simple merge

diff --cc sound/soc/intel/sst-haswell-ipc.c
Simple merge

diff --cc sound/soc/intel/sst/sst_acpi.c
Simple merge