Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000' and 'asoc...
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:19 +0000 (16:15 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:19 +0000 (16:15 +0100)

Trivial merge