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

Trivial merge