Merge remote-tracking branches 'asoc/topic/wm8997' and 'asoc/topic/wm8998' into asoc...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:44:23 +0000 (12:44 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:44:23 +0000 (12:44 +0000)

Trivial merge