Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge

diff --cc drivers/spi/spi-sh-msiof.c
Simple merge