Merge remote-tracking branch 'asoc/fix/twl-breakage' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 7 Feb 2018 11:23:48 +0000 (11:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 7 Feb 2018 11:23:48 +0000 (11:23 +0000)

Trivial merge