summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-sirf.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-03 17:33:42 +0200
committerMark Brown <broonie@kernel.org>2014-10-03 17:33:42 +0200
commitbab4d751f70bcecdcaad56dad9785224a5a6f9db (patch)
tree1ff0959fcc37611e1d13298d08e936065f33521d /drivers/spi/spi-sirf.c
parentMerge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/to... (diff)
parentspi: pl022: Add support for chip select extension (diff)
parentspi/pxa2xx-pci: remove unnecessary assignment (diff)
parentspi: rspi: Add support for new R-Car Gen2 SoCs (diff)
parentspi: sh-msiof: Add support for new R-Car Gen2 SoCs (diff)
parentspi: sirf: cleanup the indentation of marcos (diff)
downloadlinux-bab4d751f70bcecdcaad56dad9785224a5a6f9db.tar.xz
linux-bab4d751f70bcecdcaad56dad9785224a5a6f9db.zip
Merge remote-tracking branches 'spi/topic/pl022', 'spi/topic/pxa2xx', 'spi/topic/rspi', 'spi/topic/sh-msiof' and 'spi/topic/sirf' into spi-next