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

[oweals/u-boot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 5a84431c4e476f1f9f3edbde2f30efe4ce26a003..394cb14faaeeb784b7b6d7a7e78ae66c8316da58 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,12 @@ Changes since U-Boot 1.1.4:
 
 * Update default environment for INKA4x00 board.
 
+* Convert CPCI750 to use common CFI flash driver
+  Patch by Reinhard Arlt, 8 Feb 2006
+
+* Various changes to esd HH405 board specific files
+  Patch by Matthias Fuchs, 07 Feb 2006
+
 * Cleanup U-Boot boot messages on ARM.
 
   To match the U-Boot user interface on ARM platforms to the U-Boot