Merge remote-tracking branches 'spi/topic/mxs', 'spi/topic/pxa', 'spi/topic/rockchip...

diff --cc drivers/spi/Kconfig
Simple merge

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

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