diff options
| author | Mark Brown <broonie@kernel.org> | 2015-05-26 11:42:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-26 11:42:13 +0100 |
| commit | 3f6d0d8e200025c14f90344bfa060eab81d60033 (patch) | |
| tree | 101fa92d9f9ef776948f8927971387642c94fe42 /arch/ia64 | |
| parent | 94f032a69c4df88eda9e06fd66a481409c7d4ff8 (diff) | |
| parent | 3789c85206dd4efed58c83d1c29e865f22514410 (diff) | |
| parent | 5bcc3b0bbee576acf91bed481549998851c5fe56 (diff) | |
| parent | 99472cc08a8bda2c56bceec3693193cc87a33ef1 (diff) | |
Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next