Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge

diff --cc drivers/spi/spidev.c
Simple merge