From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 16 Oct 2005 22:19:16 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ea1fba136a4778b8f55e6b94a76a548cfad9f522;p=u-boot.git

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

ea1fba136a4778b8f55e6b94a76a548cfad9f522
diff --cc CHANGELOG
index 338a04c26a,79d819ffe3..f63aa1c7fd
--- a/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