From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 23 May 2009 19:57:31 +0000 (+0100)
Subject: Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
X-Git-Tag: v2.6.31-rc1~344^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2ab67fae1ab9226679495a8d260f4e6555efc5f;p=pandora-kernel.git

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

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

a2ab67fae1ab9226679495a8d260f4e6555efc5f
Reading git-diff-tree failed