Merge remote-tracking branches 'asoc/topic/si476x', 'asoc/topic/simple', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:27:34 +0000 (15:27 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:27:34 +0000 (15:27 +0000)

Trivial merge