Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:05 +0000 (18:55 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:05 +0000 (18:55 +0100)

Trivial merge