From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sat, 29 Oct 2005 21:45:04 +0000 (+0200)
Subject: Merge with /home/m8/git/u-boot
X-Git-Tag: DENX-2005-10-29-2350~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d4ee51061e70118fb598e3aca082dd11a154e87;p=kernel%2Fu-boot.git

Merge with /home/m8/git/u-boot
---

5d4ee51061e70118fb598e3aca082dd11a154e87
diff --cc CHANGELOG
index f02d194,dfbc0a1..6b0a787
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,23 -2,14 +2,29 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Add support for multiple PHYs.
+ 
+ * Correct includes for flat tree builder.
+ 
+ * Fix conflicting types (flash_write()) in trab auto_update.c.
+ 
  * 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