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

diff --cc sound/soc/fsl/fsl-asoc-card.c
Simple merge

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

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

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

diff --cc sound/soc/soc-pcm.c
Simple merge