Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:33 +0000 (15:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:33 +0000 (15:05 +0100)
1  2 
sound/soc/fsl/imx-pcm-fiq.c
sound/soc/fsl/imx-ssi.c

Simple merge
Simple merge