Merge remote-tracking branches 'asoc/fix/compress' and 'asoc/fix/mtk' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:39 +0000 (15:26 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:39 +0000 (15:26 +0000)

Trivial merge