Merge remote-tracking branch 'asoc/topic/zx_aud96p22' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:32:03 +0000 (10:32 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:32:03 +0000 (10:32 +0800)

Trivial merge