summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-octeon.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-11 00:39:52 +0200
committerMark Brown <broonie@linaro.org>2014-04-11 00:39:52 +0200
commit6eadd8463101830d50e381185701d58f4ac3abb9 (patch)
tree1afbfa0edc0e6eafb63b5cb9701becfad2896795 /drivers/spi/spi-octeon.c
parentMerge tag 'spi-v3.15' into spi-linus (diff)
parentspi: Always check complete callback before calling it (diff)
parentspi: efm32: Update binding document to make "efm32,location" property optional (diff)
parentspi: omap2-mcspi: Convert to use devm_kcalloc (diff)
parentspi: qup: Depend on ARCH_QCOM (diff)
downloadlinux-6eadd8463101830d50e381185701d58f4ac3abb9.tar.xz
linux-6eadd8463101830d50e381185701d58f4ac3abb9.zip
Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/omap2-mcspi' and 'spi/fix/qup' into spi-linus