summaryrefslogtreecommitdiff
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-04-02 15:56:24 +0100
committerMark Brown <broonie@kernel.org>2018-04-02 15:56:24 +0100
commit3ce2dcf70280980adf3f7a9dde4c1a96a20f2d0d (patch)
treea9b431d925c38dfabe287b12d001c92583cb3dde /drivers/spi/spi.c
parent43ff2dcef0fde7402a0bbcf2d1f5a507595a9fb0 (diff)
parent9581329eff9db72ab4fbb46a594fd7fdda3c51b0 (diff)
parente2b714afee32d368e0fda825c48181626979a551 (diff)
parent613bd1ea387bb48b7c9a71a0bb451ac15cfbbc01 (diff)
Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/pxa2xx' and 'spi/fix/unregiser' into spi-linus