Merge branch 'topic/smbus-block' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@kernel.org>
Fri, 4 Sep 2015 16:16:39 +0000 (17:16 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 4 Sep 2015 16:16:39 +0000 (17:16 +0100)

Trivial merge