Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:19 +0000 (10:43 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:19 +0000 (10:43 +0000)

Trivial merge