Merge remote-tracking branches 'spi/topic/flash', 'spi/topic/msg' and 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge

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

diff --cc include/linux/spi/spi.h
Simple merge