Merge branch 'topic/devm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Fri, 18 Apr 2014 17:00:30 +0000 (18:00 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Apr 2014 17:00:30 +0000 (18:00 +0100)

Trivial merge