Merge branch 'topic/gtm601' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Thu, 27 Aug 2015 19:29:18 +0000 (20:29 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 27 Aug 2015 19:29:18 +0000 (20:29 +0100)

Trivial merge