Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 17 Jul 2014 20:45:40 +0000 (21:45 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Jul 2014 20:45:40 +0000 (21:45 +0100)

Trivial merge