diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-18 00:19:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-18 00:19:50 +0100 |
| commit | 9a8d141d5ab1b50b3ab453fba1ee42da3b85919b (patch) | |
| tree | 3b92d4bf863f48b474fbe14f038b13fb1719b64d | |
| parent | 60ab73a217039853f71896007a7b30af0e917022 (diff) | |
| parent | 83f0f398a0a64a6e94dccb5a812c67648cedef29 (diff) | |
| parent | 11f2764fe7d803b5c8ac329710342ca0c5e9a790 (diff) | |
| parent | e0b047bd8fc73b35ba1081097e0223eb778d982c (diff) | |
Merge remote-tracking branches 'spi/topic/ath79', 'spi/topic/atmel' and 'spi/topic/davinci' into spi-next