diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-28 14:05:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-28 14:05:29 +0100 |
| commit | f4b81dd83e38277a3d1e6661f0fa8eea8cfe784b (patch) | |
| tree | 84bf6d90bad6468e3835f5f4b5443766dec56bf7 | |
| parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
| parent | c09b890b763df3ccd79a2c34c2f1abeb73179caf (diff) | |
| parent | ac48f6cb5f268daff06b636444819e5ffb462611 (diff) | |
Merge branches 'spi-drivers' and 'spi-mxs' into spi-next