Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Mon, 10 Feb 2014 13:31:02 +0000 (13:31 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 10 Feb 2014 13:31:02 +0000 (13:31 +0000)

Trivial merge