Merge remote-tracking branches 'asoc/fix/sgtl5000', 'asoc/fix/topology' and 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:18:22 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:18:22 +0000 (16:18 +0100)

Trivial merge