summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-cadence.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 12:17:12 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 12:17:12 +0000
commit3bcfca617a3a773a981d6dfe0b8e2a95e614c5b7 (patch)
tree3f5adcfe0ee0fa28573be952a4172f4380cafa1d /drivers/spi/spi-cadence.c
parent19a0368028de2575ed562600888d856196ebfc05 (diff)
parent5e9af37e46bceea9f950d2f2ae769f1aa6b6d7a6 (diff)
parent3cc291061ce542edff7a0f7127a654e9d05ee559 (diff)
parent30c8eb52cc4a7bed59d85243e769ce420f179140 (diff)
parent194ed900cac2070175c6e6bf6d23e6bb7400a0f2 (diff)
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/cadence', 'spi/topic/dw' and 'spi/topic/fsl-cpm' into spi-next