Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)

Trivial merge