Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 23 May 2009 19:57:31 +0000 (20:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 23 May 2009 19:57:31 +0000 (20:57 +0100)
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile


Trivial merge