summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-sh-sci.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-30 01:51:34 +0100
committerMark Brown <broonie@linaro.org>2014-03-30 01:51:34 +0100
commit81235b4ea3aa2e942ac37979433f41b748f12da1 (patch)
treec95a6038934aa552930d31765cc74742dc4171e6 /drivers/spi/spi-sh-sci.c
parentMerge remote-tracking branches 'spi/topic/omap-uwire', 'spi/topic/omap100k', ... (diff)
parentspi: s3c64xx: Let spi core handle validating transfer length (diff)
parentspi: sc18is602: Convert to let spi core validate transfer speed (diff)
parentspi: sh-hspi: Add missing call to pm_runtime_disable() in failure path (diff)
parentspi: sh-msiof: Convert to spi core auto_runtime_pm framework (diff)
parentspi: sh-sci: Prevent NULL pointer dereference (diff)
parentspi: sirf: Add missing spi_master_{resume,suspend} calls to PM callbacks (diff)
parentspi: spidev_fdx: Add support for Dual/Quad SPI Transfers (diff)
downloadlinux-81235b4ea3aa2e942ac37979433f41b748f12da1.tar.xz
linux-81235b4ea3aa2e942ac37979433f41b748f12da1.zip
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/sh-hspi', 'spi/topic/sh-msiof', 'spi/topic/sh-sci', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next