Merge branch 'irqchip/atmel-aic' into irqchip/core

Topic branch set up to facilitate merging the rest of the series which
removes the driver from arch code.

diff --cc drivers/irqchip/Kconfig
Simple merge

diff --cc drivers/irqchip/Makefile
index 7638221ee552e06f78f27f8ceb65c25afe007229,674e895fa659b4c5fa366eead7a96bd17976dcaa..73052ba9ca627c27fae12486a3b4f913692a752c
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -16,10 -15,11 +16,12 @@@ obj-$(CONFIG_ORION_IRQCHIP)                += irq-ori
  obj-$(CONFIG_ARCH_SUNXI)              += irq-sun4i.o
  obj-$(CONFIG_ARCH_SUNXI)              += irq-sunxi-nmi.o
  obj-$(CONFIG_ARCH_SPEAR3XX)           += spear-shirq.o
 -obj-$(CONFIG_ARM_GIC)                 += irq-gic.o
 +obj-$(CONFIG_ARM_GIC)                 += irq-gic.o irq-gic-common.o
 +obj-$(CONFIG_ARM_GIC_V3)              += irq-gic-v3.o irq-gic-common.o
  obj-$(CONFIG_ARM_NVIC)                        += irq-nvic.o
  obj-$(CONFIG_ARM_VIC)                 += irq-vic.o
+ obj-$(CONFIG_ATMEL_AIC_IRQ)           += irq-atmel-aic-common.o irq-atmel-aic.o
+ obj-$(CONFIG_ATMEL_AIC5_IRQ)  += irq-atmel-aic-common.o irq-atmel-aic5.o
  obj-$(CONFIG_IMGPDC_IRQ)              += irq-imgpdc.o
  obj-$(CONFIG_SIRF_IRQ)                        += irq-sirfsoc.o
  obj-$(CONFIG_RENESAS_INTC_IRQPIN)     += irq-renesas-intc-irqpin.o