From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 27 Jul 2006 14:57:34 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot/denx
X-Git-Tag: U-Boot-1_1_5~69
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc6c4a67ae94adac02da6257a0f5adc3bd48ebec;p=u-boot

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

fc6c4a67ae94adac02da6257a0f5adc3bd48ebec
diff --cc CHANGELOG
index f08ce63add,d2cfb63f9a..6b219d898e
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,10 -2,15 +2,17 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * AMCC bamboo (440EP) U-Boot image reduced to 384kbyte
+   Please see doc/README.bamboo for details.
+   Patch by Stefan Roese, 27 Jul 2006
+ 
+ * Fix CONFIG_CMDLINE_EDITING implementation
+   Patch by Stefan Roese, 27 Jul 2006
+ 
 +* Fix preboot message on TQM5200 after switching to hush parser.
 +
  * MCC200: set default configuration to low_boot DDR,
-   and support for configurable options high_boot and/or SDRAM.   
+   and support for configurable options high_boot and/or SDRAM.
  
  * Add support for 256 MB SDRAM on CPU87
    Patch by Josef Wagner, 25 Nov 2005