From: Russell King <rmk@flint.arm.linux.org.uk>
Date: Sun, 10 Mar 2002 17:32:23 +0000 (+0000)
Subject: Fix up auto merge problems.
X-Git-Tag: v2.5.7-pre1~27^2~5
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=a77eaedab4fa665d6041e4adebd217ec3cb3c3e8;p=history.git

Fix up auto merge problems.
---

a77eaedab4fa665d6041e4adebd217ec3cb3c3e8