Merge remote-tracking branch 'asoc/topic/component' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:43 +0000 (15:52 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:43 +0000 (15:52 +0000)

Trivial merge