diff options
author | Mark Brown <broonie@kernel.org> | 2016-01-11 16:48:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-11 16:48:35 +0000 |
commit | 4f9530705b7b9c977044accb035682d9f7df1cdd (patch) | |
tree | 325cd04124174ef3eb0fde245ce90c1e63d47aef /drivers/spi/spi-pl022.c | |
parent | 41d5a700514f133991db0d9d135e597b88b09775 (diff) | |
parent | bd6c1644a2f6f46cdf89388e81168a70711fce3a (diff) | |
parent | d599af65fda384b5e91780485f243c9f2d3e757d (diff) | |
parent | cc023478dc8a3ab07828620dd80303fcd81fb227 (diff) | |
parent | ec7f9eb4bea26b627cb5f15ebbfb5b06f969511d (diff) | |
parent | edd3899c8cd2a7f11d23686e375359f8ab1f818a (diff) |
Merge remote-tracking branches 'spi/topic/overlay', 'spi/topic/pxa2xx', 'spi/topic/s3c64xx', 'spi/topic/sh-msiof' and 'spi/topic/spidev' into spi-next