Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/atmel' into asoc...
authorMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 09:24:28 +0000 (10:24 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 09:24:28 +0000 (10:24 +0100)

Trivial merge