summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-04 23:57:31 +0300
committerMark Brown <broonie@kernel.org>2015-02-04 23:57:31 +0300
commitd426a842b0c203c182ec2658efc4282ef1eb80be (patch)
tree5fb25f28f792c523d9212dd1111642831b17f5f3 /drivers
parente36f014edff70fc02b3d3d79cead1d58f289332e (diff)
parent973fbce69ed8e79b5fe3ad19cfecb581a7ef8048 (diff)
parenta02bb401f8ae264be782ee57d98bdd99f14c8022 (diff)
downloadlinux-d426a842b0c203c182ec2658efc4282ef1eb80be.tar.xz
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/imx' into spi-linus