Merge branch 'topic/iio' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Thu, 11 Jan 2018 10:39:26 +0000 (10:39 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 11 Jan 2018 10:39:26 +0000 (10:39 +0000)

Trivial merge