Merge with testing-NAND (Rewrite of NAND code)

[u-boot] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 51c09eec2c53a4abb3a30477283bc623160bc26f..07ed5247e8a7d3191df907df793258c3c358838e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Rewrite of NAND code based on what is in 2.6.12 Linux kernel
+  Patch by Ladislav Michl, 29 Jun 2005
+
+* Enable PCI on hmi1001 board
+
 * Fix return values of the jffs2 commands ls/fsload/fsinfo,
   so we can use them to, e.g., check the existence of a file with
   "if ls foo; then this; else that; fi" in the hush shell