Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 20 Dec 2017 15:43:04 +0000 (15:43 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 20 Dec 2017 15:43:04 +0000 (15:43 +0000)

Trivial merge