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

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

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

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

diff --cc sound/soc/codecs/tlv320aic31xx.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/sst-dsp-priv.h
Simple merge

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