Merge branch 'topic/rcar-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
authorMark Brown <broonie@kernel.org>
Fri, 22 May 2015 13:15:16 +0000 (14:15 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 22 May 2015 13:15:16 +0000 (14:15 +0100)

Trivial merge