summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-omap2-mcspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-10 23:39:52 +0100
committerMark Brown <broonie@linaro.org>2014-04-10 23:39:52 +0100
commit6eadd8463101830d50e381185701d58f4ac3abb9 (patch)
tree1afbfa0edc0e6eafb63b5cb9701becfad2896795 /drivers/spi/spi-omap2-mcspi.c
parent09c0998efcb4a23e27c297f48309e0b2abc76563 (diff)
parent0a6d38795a405c49ea0012f04173613382def58c (diff)
parente2872090ca825a6625be93555c125072e52a7819 (diff)
parenta6f936db640f56066d0728bc135c1acd4cd9e56e (diff)
parent058f11c85126e3d77b7f676674d31c803582f2b4 (diff)
Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/omap2-mcspi' and 'spi/fix/qup' into spi-linus