Merge remote-tracking branch 'asoc/fix/mtk' into asoc-linus
authorMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:28 +0000 (11:55 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:28 +0000 (11:55 +0000)

Trivial merge