Merge remote-tracking branch 'spi/for-next'

Conflicts:
	drivers/dma/intel_mid_dma.c
	drivers/dma/intel_mid_dma_regs.h

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/Makefile
Simple merge

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