diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:41 +0100 |
| commit | 301d8384b5516596cf53b88478b4b379aa09208a (patch) | |
| tree | 8bce1850af2e081e63e62850945cbea9fb291960 | |
| parent | 8fb3b066a60ec1e39dc2f91eb87e91f434e4da81 (diff) | |
| parent | fe75cbc1bd94d9e7d837b31f4373d55d7dd91019 (diff) | |
| parent | 836d1a22db9ee0a466301465e873bc94da86cb15 (diff) | |
| parent | 8b983e90ea1a3dd82070f96c062ad521a06b7cc0 (diff) | |
| parent | 41148c3a728222a885bc2f3ba3ce66831de0b244 (diff) | |
Merge remote-tracking branches 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/rspi' and 'spi/topic/sirf' into spi-next