Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:00 +0000 (21:31 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:00 +0000 (21:31 +0000)

Trivial merge