Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 17:40:55 +0000 (18:40 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 17:40:55 +0000 (18:40 +0100)

Trivial merge