Merge remote-tracking branch 'asoc/fix/fsl-sai' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:12 +0000 (16:31 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:12 +0000 (16:31 +0100)

Trivial merge