From: Stefan Roese <sr@denx.de>
Date: Sat, 24 Mar 2007 14:59:23 +0000 (+0100)
Subject: Merge with /home/stefan/git/u-boot/acadia
X-Git-Tag: v1.3.0-rc1~119^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e50b791b3f8b696e32000bbaa6e2d1f098c4bc04;p=u-boot

Merge with /home/stefan/git/u-boot/acadia
---

e50b791b3f8b696e32000bbaa6e2d1f098c4bc04
diff --cc include/configs/acadia.h
index 9e02ca31b4,35b6a519e3..35b6a519e3
mode 100644,100755..100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h