diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-31 14:45:36 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-31 14:45:36 +0100 |
commit | 2ca0a9d80c3a2cd3917b768080cce7f59b9bc490 (patch) | |
tree | af3cb9d92244f5df56c9d5ccf9610fa8af61bc14 /drivers/spi/Makefile | |
parent | 18c558ec748b13048ae51681f7da8248ddcb7d1c (diff) | |
parent | 152933244a1a3232b32d2e973754d03321a5b0c6 (diff) | |
parent | 757fe8d514a9bab55156dfb2c4a03e56ba96a028 (diff) | |
parent | cb76b1ca9174aa29d4c7c0f4aef113be203b600c (diff) | |
parent | 99622f56110ee8cbfe8ecf2dd5e666f67cf4bb97 (diff) | |
parent | 385a9c8fccc0308dbd8182c57b29a95e01e29688 (diff) |
Merge remote-tracking branches 'spi/topic/mtk', 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/rockchip' and 'spi/topic/s3c24xx' into spi-next