Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
authorMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 11:05:47 +0000 (12:05 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 11:05:47 +0000 (12:05 +0100)
Conflicts:
sound/soc/fsl/imx-sgtl5000.c


Trivial merge