diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-22 09:48:41 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-22 09:48:41 -0700 |
| commit | 711e020cae9cd105d81a783686cb8c8059c08b2c (patch) | |
| tree | 3a72f65e1e7d8361fe9f391c11512a3740dcc516 /drivers/spi | |
| parent | 5132361cd97ed21863fb48bb8e4a0e6203a4269a (diff) | |
| parent | dd85ebf681ef0ee1fc985c353dd45e8b53b5dc1e (diff) | |
| parent | b0b4855099e301c8603ea37da9a0103a96c2e0b1 (diff) | |
Merge remote-tracking branches 'spi/fix/spidev' and 'spi/fix/xtfpga' into spi-linus