Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 4 Jul 2013 17:30:01 +0000 (18:30 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 4 Jul 2013 17:30:01 +0000 (18:30 +0100)

Trivial merge