From: Mark Brown <broonie@linaro.org>
Date: Thu, 17 Jul 2014 20:45:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
X-Git-Tag: v3.17-rc2~18^2~4^2~4^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d1c46ef85831ec6b23801a62600bcfdccfac6759;p=users%2Fdwmw2%2Flinux.git

Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
---

d1c46ef85831ec6b23801a62600bcfdccfac6759