Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)
Merge branch 'imx-devel' into devel

1  2 
arch/arm/mach-imx/irq.c
arch/arm/mach-mx3/mx31ads.c
arch/arm/plat-mxc/irq.c

Simple merge
Simple merge
Simple merge