aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-fsl-dspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-23 13:07:05 +0000
committerMark Brown <broonie@linaro.org>2014-01-23 13:07:05 +0000
commit36e66bf84ff0a9dd7f167a2a1031c6fe9ecd436a (patch)
tree050383121f7b40f472e50846275c2bf46ef28d27 /drivers/spi/spi-fsl-dspi.c
parentMerge 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 (diff)
parentspi: bcm2835: Use devm_request_irq() (diff)
parentspi/bcm63xx: fix pm sleep support (diff)
parentspi/bcm63xx-hsspi: fix pm sleep support (diff)
parentspi: bitbang: Grammar s/make to make/to make/ (diff)
parentspi: Remove duplicate code to set default bits_per_word setting (diff)
parentspi: clps711x: Add MODULE_ALIAS to support module auto-loading (diff)
parentspi: coldfire-qspi: remove redundant return value check of platform_get_resource() (diff)
parentspi/davinci: Don't select EDMA (diff)
parentspi: dw-pci: remove free for resources allocated with devm_* (diff)
parentspi: falcon: Use devm_spi_register_master() (diff)
downloadlinux-dev-36e66bf84ff0a9dd7f167a2a1031c6fe9ecd436a.tar.xz
linux-dev-36e66bf84ff0a9dd7f167a2a1031c6fe9ecd436a.zip
Merge remote-tracking branches 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/bitbang', 'spi/topic/bpw', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/dw' and 'spi/topic/falcon' into spi-linus