summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-atmel.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-04 11:01:58 +0000
committerMark Brown <broonie@kernel.org>2015-11-04 11:01:58 +0000
commit5ba838c97ba143cd971b2cdcbe2c2acbd33e0733 (patch)
tree8f10397620abafbd787606de433bace463229128 /drivers/spi/spi-atmel.c
parent26cc44f8a366a7fbebed3b98f499c2774bfcda44 (diff)
parent06515f83908d038d9e12ffa3dcca27a1b67f2de0 (diff)
parent1476253cef9dbfc1f7f6a1bd19252ca528cd63bd (diff)
parent468a32082b04c7febccfcd55b06ecbc438fcddcc (diff)
parentbc27a53928981662079aa243915b443370294a03 (diff)
parenteca37c7c117460e2fbe4e32c991bff32a961f688 (diff)
Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/imx', 'spi/fix/omap2-mcspi', 'spi/fix/ti-qspi' and 'spi/fix/xilinx' into spi-linus