diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-13 19:08:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-13 19:08:34 +0100 |
| commit | fd30c37331ad8ed7c7e0e4c21f5ee309fec21d7d (patch) | |
| tree | 1a27b35dbd67c28d2f5b1f953fd6f31dbee7a45c /drivers/spi/spi-mxs.c | |
| parent | 6c7bdf2d9c89530c87ef92ca79b1f0b2eff7ba30 (diff) | |
| parent | 111e0a9dc71ed75baa5e739289b9bdb06fda13be (diff) | |
| parent | 3d89e141bbf8619f3db97c38e33cb6d7a563614d (diff) | |
| download | linux-fd30c37331ad8ed7c7e0e4c21f5ee309fec21d7d.tar.bz2 | |
Merge remote-tracking branches 'spi/fix/pxa2xx' and 'spi/fix/qup' into spi-linus