From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 18 Feb 2007 11:27:07 +0000 (+0000)
Subject: Merge NetSilicon NS93xx tree
X-Git-Tag: v2.6.21-rc1~75^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8213084125eed3c5efbc5e13739b93dfedb88590;p=pandora-kernel.git

Merge NetSilicon NS93xx tree

Fixed conflicts:

	arch/arm/Makefile
	arch/arm/mm/Kconfig

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

8213084125eed3c5efbc5e13739b93dfedb88590
Reading git-diff-tree failed