diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:58 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:58 +0800 |
commit | 30b9278bf56623307a04c97fd740a1379964ee82 (patch) | |
tree | 40399673d7cf71b6a504bb5f1c7646c499253119 /drivers/spi/Makefile | |
parent | 4f9f4548a5c741412fffaf76530f243e319c41e8 (diff) | |
parent | ecedf5c8ed978116c57b4661651747d4bf3387b5 (diff) | |
parent | 7782a1a94825db5163f376beb8db6148fdf1aef0 (diff) | |
parent | b85bfc444c426f476e68000d5b7e64a3200c3892 (diff) | |
parent | 060556a9bd7ac8d819c7321a3e7f73bfa1276f1d (diff) |
Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev', 'spi/topic/st-ssc' and 'spi/topic/ti-qspi' into spi-next