From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 9 Oct 2008 20:31:56 +0000 (+0100)
Subject: Merge branch 'ptebits' into devel
X-Git-Tag: v2.6.28-rc1~293^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a4690c22f5da1eb1c898b61b6a80da52fbd976f;p=pandora-kernel.git

Merge branch 'ptebits' into devel

Conflicts:

	arch/arm/Kconfig
---

6a4690c22f5da1eb1c898b61b6a80da52fbd976f
Reading git-diff-tree failed