Merge remote-tracking branches 'asoc/topic/ssm2518', 'asoc/topic/sta529', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)

Trivial merge