diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-26 19:05:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-26 19:05:25 +0000 |
| commit | ec058615f1fbc03837ab048b1bb7291370b46cef (patch) | |
| tree | eb73289f1304e983fb739809daa7e1b7b66141b2 /drivers/spi | |
| parent | 13616c71334a6024149a36d51db4bb000273da00 (diff) | |
| parent | 0a8727e69778683495058852f783eeda141a754e (diff) | |
| parent | 9c4b19a07dddda3ba35a2eb9b4134d485908e2f5 (diff) | |
Merge remote-tracking branches 'spi/fix/dw' and 'spi/fix/sirf' into spi-linus