Merge branch 'irqchip/gic-vic-move' of git://git.kernel.org/pub/scm/linux/kernel...

author Will Deacon <will.deacon@arm.com>

Sat, 2 Feb 2013 15:03:10 +0000 (15:03 +0000)

committer Will Deacon <will.deacon@arm.com>

Sat, 2 Feb 2013 15:03:10 +0000 (15:03 +0000)
author Will Deacon <will.deacon@arm.com>
Sat, 2 Feb 2013 15:03:10 +0000 (15:03 +0000)
committer Will Deacon <will.deacon@arm.com>
Sat, 2 Feb 2013 15:03:10 +0000 (15:03 +0000)
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/mfd/db8500-prcmu.c
Simple merge
author	Will Deacon <will.deacon@arm.com>
	Sat, 2 Feb 2013 15:03:10 +0000 (15:03 +0000)
committer	Will Deacon <will.deacon@arm.com>
	Sat, 2 Feb 2013 15:03:10 +0000 (15:03 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/common.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/platsmp.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/db8500-prcmu.c	patch \|	diff1 \|	diff2 \|	blob \| history