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

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

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

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

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