Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:20 +0000 (14:26 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:20 +0000 (14:26 +0100)

Trivial merge