summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-12-16 13:28:32 +0000
committerMark Brown <broonie@kernel.org>2015-12-16 13:28:32 +0000
commitc1f4a149406ce41962c6ba7d92047563f9e26e0b (patch)
tree55403b0ce9140dd7b0b01e1a76dc56d5f73554af /drivers/spi
parent9ce5db27f4a959ca58d768c5c8e5c98a47361e67 (diff)
parentef22d1604c622d24ded69f40d40c3c6d83f71156 (diff)
parent56ea1075e7f07724cf9b91039aa0968a0c70112f (diff)
Merge remote-tracking branches 'spi/fix/dspi' and 'spi/fix/spidev' into spi-linus