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

diff --cc CHANGELOG
index 338a04c26a8affa36326594af81da7a4b27c2ccf,79d819ffe32657b3b433ea5b717e99ec643219fb..f63aa1c7fdf9959bc21c59d198b427d3f70cc33d
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,14 -2,10 +2,18 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Add fat & ext2 support to AMCC 440EP boards Yosemite & Bamboo.
+   Fix identification on ext2ls help entry.
+   Patch by Stefan Roese, 14 Oct 2005
+ 
 +* Add support for TQM834x boards.
 +  Cleanup.
 +
 +* Cleanup for GCC-4.x
 +
 +* Add documentation for Open Firmware Flat Tree and usage.
 +  Patch by Pantelis Antoniou, 13 Oct 2005
 +
  * Add missing files for Pantelis Antoniou's patch
    Patch by Pantelis Antoniou, 04 Sep 2005
  

diff --cc common/cmd_ext2.c
Simple merge