From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 21 Oct 2005 20:41:25 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: v2008.10-rc1~1340
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b5cac0e1958173a390ae6d620a610028cad25f8;p=platform%2Fkernel%2Fu-boot.git

Merge with /home/wd/git/u-boot/master
---

7b5cac0e1958173a390ae6d620a610028cad25f8
diff --cc CHANGELOG
index a6e8e65,9867e8a..f02d194
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,21 +2,23 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
 +* Add PCI support for the TQM834x board.
 +
+ * Add missing 4xx board to MAKEALL
+   Patch by Stefan Roese, 20 Oct 2005
+ 
+ * Fix conflicting types (flash_write()) in esd auto_update.c
+   Patch by Stefan Roese, 20 Oct 2005
+ 
+ * Fix problem with sleep in NetConsole (use get_timer())
+   Patch by Stefan Roese, 20 Oct 2005
+ 
+ * Add NetConsole Support for AMCC eval boards
+   Patch by Stefan Roese, 20 Oct 2005
+ 
+ * Fix NetConsole support on 4xx (only print eth link on 1st transfer)
+   Patch by Stefan Roese, 18 Oct 2005
+ 
  * Add fat & ext2 support to AMCC 440EP boards Yosemite & Bamboo.
    Fix identation on ext2ls help entry.
    Patch by Stefan Roese, 14 Oct 2005