summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-img-spfi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-31 14:45:32 +0100
committerMark Brown <broonie@kernel.org>2015-08-31 14:45:32 +0100
commit18c558ec748b13048ae51681f7da8248ddcb7d1c (patch)
tree11a91e823409aaf072f0b11bf24db5f9d99f6132 /drivers/spi/spi-img-spfi.c
parent9d05943e79cc54a9d8ef8196900d7cca9e5ca039 (diff)
parentc4fe57f76269dbb2af135071513f260ca40229a3 (diff)
parent37c5db7938093cada165146ee99bd57c97baf6a3 (diff)
parent93e3a9e9993ef018522b7005d97d8124b7e73385 (diff)
parent1f2112af11e4c330cd070464e95ba9f546b8959b (diff)
downloadlinux-stable-18c558ec748b13048ae51681f7da8248ddcb7d1c.tar.gz
linux-stable-18c558ec748b13048ae51681f7da8248ddcb7d1c.tar.bz2
linux-stable-18c558ec748b13048ae51681f7da8248ddcb7d1c.zip
Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/fsl-espi', 'spi/topic/img-spfi' and 'spi/topic/mpc512x-psc' into spi-next