diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 17:21:12 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 17:21:12 +0100 |
commit | 0c18b7638a11af1a7b6727162f1a4a362d4ac7bf (patch) | |
tree | 84fcb8c29929d1a73f5aeff79b6fd7494804b7f1 /drivers/media/Makefile | |
parent | 7e5ad716b62d9cc1c13581302422f543ea3317bb (diff) | |
parent | 1403381638e03b361afde8f3e107ecc8e6c8f54f (diff) | |
parent | d555ea05f9d8ebf567eaa6b4e4cb5776aacf2940 (diff) | |
parent | 70cea0a95331fe7593f125e2d791c2d5ae454c94 (diff) | |
parent | db7e8d90cae5d0840ad1444b693ec43dbfab339f (diff) | |
parent | 85912a88c1ebcad04a5cfec971771195ce8d6691 (diff) |
Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pl022', 'spi/topic/qup', 'spi/topic/rockchip' and 'spi/topic/rspi' into spi-next