From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 25 Mar 2006 22:08:55 +0000 (+0000)
Subject: Merge nommu tree
X-Git-Tag: v2.6.17-rc1~661^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0003cedfc577be9d679c16531f8720739e9637ed;p=pandora-kernel.git

Merge nommu tree

Fix merge conflict in arch/arm/mm/proc-xscale.S

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

0003cedfc577be9d679c16531f8720739e9637ed
Reading git-diff-tree failed