summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-11 23:08:56 +0100
committerMark Brown <broonie@kernel.org>2015-04-11 23:08:56 +0100
commit31d25e5cdad8e627a6509261da8b1eb083d66107 (patch)
tree638f372846ec6f7cedd729139966542b1dda7f41 /drivers
parent68a595c7754d22bfe741a27c7df0965160df575d (diff)
parente689d6df8257f92abf59e93736632b79c9b2aa66 (diff)
parentf511ab09dfb0fe7b2335eccac51ff9f001a32e4a (diff)
parent754ec43c0184aae48f5a8c917d8282449ab564a9 (diff)
downloadlinux-31d25e5cdad8e627a6509261da8b1eb083d66107.tar.bz2
Merge remote-tracking branches 'spi/fix/fsl-dspi', 'spi/fix/imx' and 'spi/fix/rockchip' into spi-linus