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

diff --cc CHANGELOG
index f02d194ffba038b14fb1517351195ad23a6c782d,dfbc0a12199a8550a40a11605ef70dd76a101bfb..6b0a787d09e9b85e5ecbf920fdca227bfcb66e2d
--- 1/CHANGELOG
--- 2/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

diff --cc cpu/ppc4xx/4xx_enet.c
Simple merge