diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-18 00:19:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-18 00:19:56 +0100 |
| commit | fda052b0a52261ecad8c8beb6bcfa1663a35975f (patch) | |
| tree | 75d7de4a125783065a60ba3221b275e52c9b7dad /drivers/spi/Makefile | |
| parent | b9e2c097efe19c3c04ea3d84b295748e39e96c2b (diff) | |
| parent | 5bcc3b0bbee576acf91bed481549998851c5fe56 (diff) | |
| parent | 99472cc08a8bda2c56bceec3693193cc87a33ef1 (diff) | |
| parent | 2c05136c28048406552723685bcaf632d3d93ef1 (diff) | |
Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next