Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:57:07 +0000 (13:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:57:07 +0000 (13:57 +0100)
commit5dccf54e2b5e469f5577f3fe6ef95a279858d011
tree7ef9cff29f407bad3bc3cf86341ba52576fb7527
parent48539f73cb12bc22c6c071e0a9688656126d9a4c
parentfa659d830df0bad8fc3a3815a7f36bd8b7ed9254
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
sound/soc/fsl/imx-pcm-fiq.c
sound/soc/fsl/imx-ssi.c