summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-sh.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-23 13:07:01 +0000
committerMark Brown <broonie@linaro.org>2014-01-23 13:07:01 +0000
commit1504d226f7baf533f31c03232c3ac0d8c67db567 (patch)
tree2591358f25f658d59afeb5ea13af8c124084ae6c /drivers/spi/spi-sh.c
parent3c1039745ef2925aceed53d38af0cddac8e36f31 (diff)
parent9637b86fd1b75c913b42957b322d0871464f5a1b (diff)
parente07725be735e1791cf74e9db06a8bde62e1f517d (diff)
parentcaedb997a400ab50da201dd415c3ef7cce016437 (diff)
parent6fd8b8503a0dcf66510314dc054745087ae89f94 (diff)
parente4d313ff79a8b5622a8c4954ba37c6564fa922c4 (diff)
parent483c319188c74e82b29a0ed7a7fa7065570f2193 (diff)
parente3d8bee38543b1f3e6731916c4f11bea4d9f760f (diff)
parent646d79b2d7bdf99b4776f0d2d818559de710ea28 (diff)
parenta6f4c8e06b7258fd14033e20499d9a4e98aa1b7e (diff)
parent8090d6d1a415d3ae1a7208995decfab8f60f4f36 (diff)
Merge remote-tracking branches 'spi/fix/bcm63xx', 'spi/fix/dspi', 'spi/fix/hspi', 'spi/fix/imx', 'spi/fix/msiof', 'spi/fix/pxa2xx', 'spi/fix/qspi', 'spi/topic/altera', 'spi/topic/ath79' and 'spi/topic/atmel' into spi-linus