Merge branch 'topic/dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@kernel.org>
Wed, 27 Apr 2016 16:35:42 +0000 (17:35 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 27 Apr 2016 16:35:42 +0000 (17:35 +0100)

Trivial merge