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)
commitb1add0480a95b6ceaece5caf6c50614771eae9b2
tree06f969f37bd0f51d9ebcccdb3e3ae983edaad889
parent3f30a09a612bac2b531a206c2a58a292dd7ff182
parent58a85f465fb16a918a869eba05addb8f78d9e064
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

Merge branch 'imx-devel' into devel
arch/arm/mach-imx/irq.c
arch/arm/mach-mx3/mx31ads.c
arch/arm/plat-mxc/irq.c