summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-18 00:19:46 +0100
committerMark Brown <broonie@kernel.org>2015-06-18 00:19:46 +0100
commit5bfb10d78e629196ec9fce7d944e28ee9592ee2f (patch)
tree00da7208d1ad6193ce9ceec7f74d37da12ede267 /drivers
parent8757091bfa92579527ad2e7b22b22c7def0139ce (diff)
parent9deef024a12ebae4965c89837f662905ac88944b (diff)
parent7a0a1759f7b157f56b8f291f3664db4b65963c8a (diff)
parentce2f6ea1cbd41d78224f703af980a6ceeb0eb56a (diff)
parentea6055c46eda1e19e02209814955e13f334bbe1b (diff)
Merge remote-tracking branches 'spi/fix/fsl-dspi', 'spi/fix/fsl-espi', 'spi/fix/orion' and 'spi/fix/pl022' into spi-linus