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)
commit23abd863d2d6072eefbbf77543c349cd8a9fc5d8
tree0015d453518c400cff3911a148860b4514e99a9f
parentd45a26bd9790fcde58cf4b11a775ff56c6b44e0b
parentcd3ff762991ebf309e089ed5a87a8965f175f46a
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
sound/soc/fsl/imx-pcm-fiq.c
sound/soc/fsl/imx-ssi.c