From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 21 Nov 2011 21:56:56 +0000 (+0000)
Subject: Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.3-rc1~141^2~3^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d13ccaa8797d7e599f3792aed4b1e44b47f94a5;p=pandora-kernel.git

Merge branch 'irqchip-consolidation' of git://git./linux/kernel/git/maz/arm-platforms into devel-stable

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.
---

2d13ccaa8797d7e599f3792aed4b1e44b47f94a5
Reading git-diff-tree failed