Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 14:54:28 +0000 (15:54 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 14:54:28 +0000 (15:54 +0100)
commit6b0e233ae500b2f4f32bedde36a27a57e99a775f
tree77f121bdd71d868a8332ee32790466ca579c6665
parent6953055211dc827738cf923ebce52eb08fba1ea5
parentacf2c60a60b3d6d7080854b9483f37d99ded9b23
parent5ba4059c385544001031ecff1335e10b3365112c
Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus