From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 28 Nov 2008 15:39:02 +0000 (+0000)
Subject: Merge branch 'highmem' into devel
X-Git-Tag: v2.6.29-rc1~559^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ef4de17cc55a3c3b8d093743b1e3b845d8eba47;p=pandora-kernel.git

Merge branch 'highmem' into devel

Conflicts:

	arch/arm/mach-clps7500/include/mach/memory.h
---

7ef4de17cc55a3c3b8d093743b1e3b845d8eba47
Reading git-diff-tree failed