Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bt-sco', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:51 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:51 +0000 (18:54 +0100)

Trivial merge