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

[platform/kernel/u-boot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 6782492..24499c5 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,19 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix control-c handing in CONFIG_CMDLINE_EDITING
+  Properly pass break code back from readline.
+  Patch by Roger Blofeld, 31 Jul 2006
+
+* Add commandline history support to all AMCC eval boards
+  Patch by Stefan Roese, 07 Aug 2006
+
+* Add Macronix MXLV320T flash support for AMCC Bamboo
+  Patch by Stefan Roese, 07 Aug 2006
+
+* Change "mii info" to not print an error upon missing PHY at address
+  Patch by Stefan Roese, 07 Aug 2006
+
 * Fix PCI-Express on PPC440SPe rev. A.
 
 * Fix preboot message on TQM85xx after switching to hush parser.