summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-23 13:50:18 +0100
committerMark Brown <broonie@linaro.org>2014-04-23 13:50:18 +0100
commit201f9e4dd5ecdefa70d4cf94750a667e2382d13f (patch)
tree623fa2e34b457ba19be7cbf5279ff3eec5601ef6 /arch/arm
parenta798c10faf62a505d24e5f6213fbaf904a39623f (diff)
parent1676014ef974ce71a854e7f415e2bb52feb24868 (diff)
parente8304d04ac88c21b2a68d189f01678d71479a803 (diff)
parent4a4dd7d80e11f62cacf49bd90d9448a218188af7 (diff)
parent6ee8a2f7d5e78700b6e64799b5e9976b21cfad79 (diff)
Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bfin5xx', 'spi/fix/hspi' and 'spi/fix/sirf' into spi-linus