Merge with testing-NAND (Rewrite of NAND code)

[kernel/u-boot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 2d24962..07ed524 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 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,