Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 10 Sep 2014 11:02:41 +0000 (12:02 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 10 Sep 2014 11:02:41 +0000 (12:02 +0100)

Trivial merge