Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Thu, 27 Feb 2014 09:54:00 +0000 (18:54 +0900)
committerMark Brown <broonie@linaro.org>
Thu, 27 Feb 2014 09:54:00 +0000 (18:54 +0900)

Trivial merge