Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:19:52 +0000 (11:19 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:19:52 +0000 (11:19 +0100)

Trivial merge