Merge remote-tracking branches 'asoc/topic/fsl_esai', 'asoc/topic/fsl_ssi', 'asoc...
authorMark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:29:40 +0000 (10:29 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:29:40 +0000 (10:29 +0800)

Trivial merge