Merge remote-tracking branch 'asoc/fix/topology-abi' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 18:34:05 +0000 (12:34 -0600)
committerMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 18:34:05 +0000 (12:34 -0600)

Trivial merge