Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:40 +0000 (16:31 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:40 +0000 (16:31 +0100)
1  2  3  4  5 
sound/soc/fsl/Kconfig
sound/soc/fsl/fsl_sai.c
sound/soc/fsl/fsl_spdif.c
sound/soc/fsl/fsl_ssi.c

Simple merge
Simple merge
Simple merge
Simple merge