Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rb4xx', 'spi/topic/rspi...
authorMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:53 +0000 (00:19 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:53 +0000 (00:19 +0100)
1  2  3  4  5  6 
drivers/spi/Kconfig
drivers/spi/Makefile

Simple merge
Simple merge