Merge remote-tracking branch 'asoc/topic/dma' into asoc-fsl
authorMark Brown <broonie@linaro.org>
Mon, 2 Dec 2013 11:48:48 +0000 (11:48 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 2 Dec 2013 11:48:48 +0000 (11:48 +0000)

Trivial merge