Merge remote-tracking branches 'asoc/fix/fsl-dma', 'asoc/fix/fsl-spdif', 'asoc/fix...
authorMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 15:05:16 +0000 (16:05 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 15:05:16 +0000 (16:05 +0100)

Trivial merge