Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:14:57 +0000 (16:14 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:14:57 +0000 (16:14 +0100)

Trivial merge