Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 09:24:30 +0000 (10:24 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 09:24:30 +0000 (10:24 +0100)

Trivial merge