Merge remote-tracking branches 'asoc/topic/dpcm', 'asoc/topic/dwc', 'asoc/topic/fsl...
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:40 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:40 +0000 (00:23 +0000)
1  2  3  4  5  6 
sound/soc/fsl/fsl-asoc-card.c
sound/soc/fsl/fsl_asrc.c
sound/soc/fsl/fsl_esai.c
sound/soc/fsl/fsl_sai.c
sound/soc/soc-pcm.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge