Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:49 +0000 (13:01 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:49 +0000 (13:01 +0000)

Trivial merge