Merge /home/tur/nand/u-boot/

[people/ms/u-boot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index a4b0700dbcd7bf409be920fbe418e46cceffc4b0..fba2d00004cba83e235eef7b16a1a4bddfc49499 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Merge the new NAND code (testing-NAND brach)
+
+  Rewrite of NAND code based on what is in 2.6.12 Linux kernel
+  Patch by Ladislav Michl, 29 Jun 2005
+
 * Add basic support for the SMMACO4 Board from PanDaCom.
   Patch by Heiko Schocher, 20 Feb 2006