Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
authorMark Brown <broonie@kernel.org>
Tue, 10 Jan 2017 10:47:48 +0000 (10:47 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 10 Jan 2017 10:47:48 +0000 (10:47 +0000)

Trivial merge