diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-23 13:07:09 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-23 13:07:09 (GMT) |
commit | 907e26b6f52004ecec152f5650b5dc687aed7157 (patch) | |
tree | 6db598a582837ee1021a384ccef739937dfaed64 /drivers/spi/spi-sh-msiof.c | |
parent | 36e66bf84ff0a9dd7f167a2a1031c6fe9ecd436a (diff) | |
parent | 714bb654e97535c4bed4a8da0628cbc842dc8e31 (diff) | |
parent | ba1271bb05f81a1f4b26ab7a87771147d6f3185e (diff) | |
parent | c6c07b4f6d697cab021ca07de21c4c0da2ac47b1 (diff) | |
parent | e1d0cd473be4c88f823fa55e880ca6ae05d685f6 (diff) | |
parent | 50a7799829835120950520231797642e19d4152f (diff) | |
parent | 7c7ccc52fc7b6d75bb7604a59cc641fa6336b619 (diff) | |
parent | e826a7ff69b285ea295144303653c01f781ea9dc (diff) | |
parent | 84acfd4340f9c7cef7286eb9d539e78fb3a15292 (diff) | |
parent | bb489841b1312f60b2450b01b1c5fa019872f0d3 (diff) | |
parent | 9a21e4770ac828a49e722897c3c0250f630f4a48 (diff) | |
download | linux-907e26b6f52004ecec152f5650b5dc687aed7157.tar.xz |
Merge remote-tracking branches 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/hspi', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', 'spi/topic/oc-tiny', 'spi/topic/omap', 'spi/topic/orion' and 'spi/topic/pci' into spi-linus