From: Mark Brown <broonie@linaro.org>
Date: Tue, 17 Jun 2014 14:54:28 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b0e233ae500b2f4f32bedde36a27a57e99a775f;p=linux.git

Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus
---

6b0e233ae500b2f4f32bedde36a27a57e99a775f