Merge branch 'irqchip/gic-vic-move' into next/virt

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/mach-imx/common.h
Simple merge

diff --cc arch/arm/mach-imx/platsmp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc drivers/mfd/db8500-prcmu.c
Simple merge