Merge branch 'topic/of-name' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Thu, 16 Jul 2015 21:04:17 +0000 (22:04 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 16 Jul 2015 21:04:17 +0000 (22:04 +0100)

Trivial merge