From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 17 Nov 2005 15:47:30 +0000 (+0000)
Subject: [DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms
X-Git-Tag: v2.6.15-rc2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d78c887a94067ba218dc71b89d0d7a09415197f;p=pandora-kernel.git

[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms

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

Reading git-diff-tree failed