diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:35 +0100 |
| commit | 446fe5e2d5616eb52c928e58f16558ab7c0d2414 (patch) | |
| tree | a1352970d4a7044643a4f00f98cba9c1ade9a8b0 /drivers/media/pci/Makefile | |
| parent | f54645d1aac092d5b3065b1d1fe181dff4deb71d (diff) | |
| parent | c34cc2487d5e6c225609696db3f49d40259787e2 (diff) | |
| parent | b112f0585edd1c10e4986373d93ab0d95d12da82 (diff) | |
| parent | 25dbe04a24516cdfd6bd215c1caaf28916b91a82 (diff) | |
Merge remote-tracking branches 'spi/topic/adi', 'spi/topic/atmel' and 'spi/topic/cadence' into spi-next