Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix...
authorMark Brown <broonie@kernel.org>
Mon, 11 May 2015 16:29:49 +0000 (17:29 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 11 May 2015 16:29:49 +0000 (17:29 +0100)
1  2  3  4 
drivers/spi/Kconfig

Simple merge