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

Trivial merge