Merge branch 'topic/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 10:19:08 +0000 (11:19 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 10:19:08 +0000 (11:19 +0100)

Trivial merge