Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)
diff --cc arch/arm/mach-imx/irq.c
Simple merge
diff --cc arch/arm/mach-mx3/mx31ads.c
Simple merge
diff --cc arch/arm/plat-mxc/irq.c
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)
		1	2
arch/arm/mach-imx/irq.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx3/mx31ads.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/irq.c	patch \|	diff1 \|	diff2 \|	blob \| history