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

diff --cc CHANGELOG
index a6e8e65bab3ffe0b8d8880151e684f1c82604c53,9867e8a389c1ed541e8519aae7cb40a17b6da4a3..f02d194ffba038b14fb1517351195ad23a6c782d
--- 1/CHANGELOG
--- 2/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