| commit | 6b0e233ae500b2f4f32bedde36a27a57e99a775f | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Tue Jun 17 15:54:28 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Tue Jun 17 15:54:28 2014 +0100 |
| tree | 77f121bdd71d868a8332ee32790466ca579c6665 | |
| parent | 6953055211dc827738cf923ebce52eb08fba1ea5 [diff] | |
| parent | acf2c60a60b3d6d7080854b9483f37d99ded9b23 [diff] | |
| parent | 5ba4059c385544001031ecff1335e10b3365112c [diff] |
Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus