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)
commita2ab67fae1ab9226679495a8d260f4e6555efc5f
treef7de683c9c8ff0869a7e11f1d40802145d05f5b4
parent6d0485a99366d4e0e7e725f14995c74cb7ca4499
parent135cad366b4e7d6a79f6369f6cb5b721985aa62f
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/Kconfig
arch/arm/Makefile