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

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

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

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