Merge remote-tracking branch 'asoc/fix/dma' into asoc-dma
authorMark Brown <broonie@linaro.org>
Mon, 9 Dec 2013 18:44:55 +0000 (18:44 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 9 Dec 2013 18:44:55 +0000 (18:44 +0000)

Trivial merge