summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-06 12:32:09 +0100
committerMark Brown <broonie@kernel.org>2016-09-06 12:32:09 +0100
commitae4860b5333586b60ca1798f3f83b8b37520904c (patch)
treef72ca319de01ae449de21173195e52ceae45bb98 /drivers/spi/spi.c
parentc6935931c1894ff857616ff8549b61236a19148f (diff)
parent764f21665a12e99f03124b4c8de722cdbff92213 (diff)
parent2e365a703ea60de617287354ae63bf677e406feb (diff)
parent2932c287108e2987454449b8214eae6db066da85 (diff)
parentb70cd2de0ea85f5ab51a1d01893cba6415011b9d (diff)
parentc3ccf357c3d75bd2924e049b6a991f7c0c111068 (diff)
parentd0716dde375eb6bff332763bb2137302120d263d (diff)
downloadlinux-ae4860b5333586b60ca1798f3f83b8b37520904c.tar.bz2
Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put', 'spi/fix/pxa2xx', 'spi/fix/sh-msiof' and 'spi/fix/timeout' into spi-linus