From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 26 Mar 2009 23:10:11 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
X-Git-Tag: v2.6.30-rc1~636^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=542f869f1826f092606efd0c4c771f070d1314f5;p=pandora-kernel.git

Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

Conflicts:
	arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

542f869f1826f092606efd0c4c771f070d1314f5
Reading git-diff-tree failed