Merge branch 'fix/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 8 Aug 2016 10:35:14 +0000 (11:35 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 8 Aug 2016 10:35:14 +0000 (11:35 +0100)

Trivial merge