Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:45 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:45 +0000 (18:54 +0100)

Trivial merge