Merge remote-tracking branch 'asoc/topic/inte' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:51:38 +0000 (16:51 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:51:38 +0000 (16:51 +0100)

Trivial merge