From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 18 Aug 2006 09:38:05 +0000 (+0200)
Subject: Merge with git+ssh://fifi/home/wd/git/u-boot/master
X-Git-Tag: U-Boot-1_1_5~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4bfb63207765e9048668eb1fe17ac51b02662635;p=oweals%2Fu-boot.git

Merge ... git+ssh://fifi/home/wd/git/u-boot/master
---

4bfb63207765e9048668eb1fe17ac51b02662635
diff --cc CHANGELOG
index 961e073e4c,c919b5b60c..ff6eadb1fd
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,12 -2,21 +2,27 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Update for SC520 board.
+   Patch by David Updegraff, 02 Dec 2005
+ 
+ * Fixed common.h spelling error.
+   Patch by Cory Tusar, 30 Nov 2005
+ 
+ * Fix typo.
+   Patch by Andreas Engel, 28 Nov 2005
+ 
+ * Fix fatload command on FAT32 formatted partitions.
+   Patch by Joachim Jaeger, 18 Nov 2005
+ 
+ * Fix drivers/dm9000.c when configured in 32 bit mode.
+   Patch by Eric Benard, 17 Nov 2005
+ 
 +* Cleanup debug code for yucca board.
 +
 +* MCC200: restrict addressable flash space to 32 MB
 +
 +* Add debug console on COM12 for MCC200 board
 +
  * Fix control-c handing in CONFIG_CMDLINE_EDITING
    Properly pass break code back from readline.
    Patch by Roger Blofeld, 31 Jul 2006