diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-30 09:14:14 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-30 09:14:14 -0700 |
| commit | 66b5a337d0280dc60eb89116fb033df1e4b2e515 (patch) | |
| tree | 4f9940bd5734025f62f66c806b526efe735e366d /drivers/spi/Makefile | |
| parent | e2df04ed3be123fb53740303779e13748b9f8b65 (diff) | |
| parent | 568852b7002414c81084f07c7e39e897229d3b6f (diff) | |
| parent | a3cfea0448905581c4dfc087342f5142793bcb66 (diff) | |
| parent | 089bd46d8bc1fe5a28351e82e4adcaa5a40121b5 (diff) | |
| parent | 9d04d8bc4c18765f6a1f7b632fffe47b4578fb26 (diff) | |
Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/pic32-sqi', 'spi/topic/pxa2xx' and 'spi/topic/qup' into spi-next