From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 6 May 2007 19:58:29 +0000 (+0100)
Subject: Merge branch 'ixp4xx' into devel
X-Git-Tag: v2.6.22-rc1~1009^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cd47155155a32e5b944ac9fc3f3dc578e429aa0;p=pandora-kernel.git

Merge branch 'ixp4xx' into devel

Conflicts:

	include/asm-arm/arch-ixp4xx/io.h
---

5cd47155155a32e5b944ac9fc3f3dc578e429aa0
Reading git-diff-tree failed