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)
1  2  3  4  5 
drivers/spi/spi-img-spfi.c

Simple merge