From: Peter Pearse <peter.pearse@arm.com>
Date: Thu, 19 Apr 2007 12:17:20 +0000 (+0100)
Subject: Merge with git://www.denx.de/git/u-boot.git
X-Git-Tag: v1.3.0-rc1~101^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee89bf2782406b1f87088b4764aeb6f811d82526;p=oweals%2Fu-boot.git

Merge with git://www.denx.de/git/u-boot.git
---

ee89bf2782406b1f87088b4764aeb6f811d82526
diff --cc MAINTAINERS
index 04394547e6,2a43848fc9..c3c73da4f7
mode 100755,100644..100644
--- a/MAINTAINERS
+++ b/MAINTAINERS