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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-pxa/em-x270.c
Simple merge

diff --cc arch/arm/mach-pxa/hx4700.c
Simple merge

diff --cc arch/arm/mach-pxa/magician.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
Simple merge

diff --cc drivers/mtd/spi-nor/Kconfig
Simple merge

diff --cc drivers/mtd/spi-nor/Makefile
index 4e4d400,2adedbe..189a15c
--- 1/drivers/mtd/spi-nor/Makefile
--- 2/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@@ -2,9 -2,8 +2,8 @@@
  obj-$(CONFIG_MTD_SPI_NOR)     += spi-nor.o
  obj-$(CONFIG_SPI_ASPEED_SMC)  += aspeed-smc.o
  obj-$(CONFIG_SPI_CADENCE_QUADSPI)     += cadence-quadspi.o
- obj-$(CONFIG_SPI_FSL_QUADSPI) += fsl-quadspi.o
  obj-$(CONFIG_SPI_HISI_SFC)    += hisi-sfc.o
 -obj-$(CONFIG_MTD_MT81xx_NOR)    += mtk-quadspi.o
 +obj-$(CONFIG_SPI_MTK_QUADSPI)    += mtk-quadspi.o
  obj-$(CONFIG_SPI_NXP_SPIFI)   += nxp-spifi.o
  obj-$(CONFIG_SPI_INTEL_SPI)   += intel-spi.o
  obj-$(CONFIG_SPI_INTEL_SPI_PCI)       += intel-spi-pci.o