From: Mark Brown <broonie@linaro.org>
Date: Tue, 3 Dec 2013 18:08:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
X-Git-Tag: v3.13-rc3~12^2~1^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd;p=users%2Fjedix%2Flinux-maple.git

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

1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd