Merge remote-tracking branch 'xtensa/for_next'

diff --combined drivers/irqchip/Makefile
index f743006ce7adaafcb7b497c2b9ced838684d7c5d,66913f9587b35de6a6599d9a88603785e9508d2a..679e2d102a296e84a60acdc9d24a3cbcffe7d5d5
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -1,7 -1,6 +1,7 @@@
  obj-$(CONFIG_IRQCHIP)                 += irqchip.o
  
  obj-$(CONFIG_ARCH_BCM2835)            += irq-bcm2835.o
 +obj-$(CONFIG_ARCH_DOVE)                       += irq-dove.o
  obj-$(CONFIG_ARCH_EXYNOS)             += exynos-combiner.o
  obj-$(CONFIG_ARCH_MMP)                        += irq-mmp.o
  obj-$(CONFIG_ARCH_MVEBU)              += irq-armada-370-xp.o
@@@ -23,3 -22,5 +23,5 @@@ obj-$(CONFIG_RENESAS_IRQC)            += irq-rene
  obj-$(CONFIG_VERSATILE_FPGA_IRQ)      += irq-versatile-fpga.o
  obj-$(CONFIG_ARCH_VT8500)             += irq-vt8500.o
  obj-$(CONFIG_TB10X_IRQC)              += irq-tb10x.o
+ obj-$(CONFIG_XTENSA)                  += irq-xtensa-pic.o
+ obj-$(CONFIG_XTENSA_MX)                       += irq-xtensa-mx.o