Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl
authorMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 16:29:05 +0000 (17:29 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 16:29:05 +0000 (17:29 +0100)
Conflicts:
sound/soc/fsl/fsl_ssi.c


Trivial merge