Merge branch 'topic/axi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Tue, 14 Jan 2014 21:28:22 +0000 (21:28 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 14 Jan 2014 21:28:22 +0000 (21:28 +0000)

Trivial merge