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

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

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

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

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

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

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

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

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