Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/fsl-espi', 'spi/topic/img...
authorMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:32 +0000 (14:45 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:32 +0000 (14:45 +0100)
commit18c558ec748b13048ae51681f7da8248ddcb7d1c
tree11a91e823409aaf072f0b11bf24db5f9d99f6132
parent9d05943e79cc54a9d8ef8196900d7cca9e5ca039
parentc4fe57f76269dbb2af135071513f260ca40229a3
parent37c5db7938093cada165146ee99bd57c97baf6a3
parent93e3a9e9993ef018522b7005d97d8124b7e73385
parent1f2112af11e4c330cd070464e95ba9f546b8959b
Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/fsl-espi', 'spi/topic/img-spfi' and 'spi/topic/mpc512x-psc' into spi-next
drivers/spi/spi-img-spfi.c