summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-mxs.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-28 11:31:35 +0000
committerMark Brown <broonie@linaro.org>2013-11-28 11:31:35 +0000
commitc18158f1fdad0de6be5386291189580484e459cf (patch)
tree70c0b61bf09aadfccb9ddcb21284f9b59a2838a2 /drivers/spi/spi-mxs.c
parentb8aba7611b9a5a1f67f081be84270c67baf4d2c3 (diff)
parente0b35b89d8d150eeb12437159bf059acd34758e5 (diff)
parentec3252687ae4ad0c3889010aee726c7a05606fe0 (diff)
parenta4469a429fc71af6bad9c9e3f7307249dedfe8d1 (diff)
parente322ce9365693b417867f6bd700ddf09cca36b37 (diff)
parentc50325f7bcb8a3ceaacb9dbc41180b1cbbae7b5e (diff)
parentcbcabb7a300bf5ab868c632048889a933e7cdae5 (diff)
parent53063ec6e2cc38000f98a5de557b7e4fed186cfc (diff)
parentb38f87ec503ac68e5c38044101eedba869a56b0d (diff)
downloadlinux-c18158f1fdad0de6be5386291189580484e459cf.tar.gz
linux-c18158f1fdad0de6be5386291189580484e459cf.tar.bz2
linux-c18158f1fdad0de6be5386291189580484e459cf.zip
Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x-psc', 'spi/fix/mxs', 'spi/fix/pxa2xx', 'spi/fix/qspi', 'spi/fix/rspi' and 'spi/fix/txx9' into spi-linus