Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 19 Dec 2013 10:25:27 +0000 (10:25 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 19 Dec 2013 10:25:27 +0000 (10:25 +0000)

Trivial merge