diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:09 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:09 +0000 |
| commit | 8a9e77653fc2bc8590a471b58097f258248b9369 (patch) | |
| tree | 0b9358903fa569608595b7ae3945eece44584aeb /drivers/spi | |
| parent | c2da04dc21e6687b6cd46a74667e08ab4f651c48 (diff) | |
| parent | f9b841af4c1c3c3b7ce3552ab5ee5d9c430e9c29 (diff) | |
| parent | d7ef54ca1219ddf99d56a0f7cf40912ab4c4bb0b (diff) | |
Merge remote-tracking branches 'spi/topic/coldfire' and 'spi/topic/dw' into spi-next