Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
authorMark Brown <[email protected]>
Wed, 20 Dec 2017 15:43:04 +0000 (15:43 +0000)
committerMark Brown <[email protected]>
Wed, 20 Dec 2017 15:43:04 +0000 (15:43 +0000)

Trivial merge