Merge branch 'topic/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 13 Jun 2017 20:52:08 +0000 (21:52 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 13 Jun 2017 20:52:08 +0000 (21:52 +0100)

Trivial merge