Merge branch 'fix/rcar' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 8 Dec 2017 18:53:18 +0000 (18:53 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 8 Dec 2017 18:53:18 +0000 (18:53 +0000)

Trivial merge