summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 00:09:09 +0200
committerMark Brown <broonie@kernel.org>2015-04-12 00:09:09 +0200
commit431959c0793e0d399303a061424dbaa1b33eb940 (patch)
tree44d89cf7c42021b970c8fc173a6e8500c77547a5 /drivers/spi/spi.c
parentMerge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/t... (diff)
parentspi: spi-bfin5xx: Initialize cr_width in bfin_spi_pump_transfers() (diff)
parentspi: cadence: Remove Kconfig dependency (diff)
parentspi: dw: fix crash on setup stage (diff)
parentspi: Make master->handle_err() callback optional to avoid crashes (diff)
downloadlinux-431959c0793e0d399303a061424dbaa1b33eb940.tar.xz
linux-431959c0793e0d399303a061424dbaa1b33eb940.zip
Merge remote-tracking branches 'spi/topic/blackfin', 'spi/topic/cadence', 'spi/topic/dw' and 'spi/topic/err' into spi-next