Merge with testing-NAND (Rewrite of NAND code)

diff --cc CHANGELOG
index 2d24962,5e70161..07ed524
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,26 -2,9 +2,29 @@@
  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
 +  Patch by Andreas Engel, 16 August 2005
 +
 +* Coding style cleanup
 +
 +* Add support for Silicon Turnkey eXpress XTc (mpc87x/88x) board.
 +  Patch by Dan Malek and Pantelis Antoniou, 15 Aug 2005
 +
 +* Check return value of malloc in 440gx_enet.c
 +  Patch by Travis B. Sawyer, 18 Jul 2005
 +
 +* Add Sandburst Metrobox and Sandburst Karef board support packages.
 +  Second serial port on 440GX now defined as a system device.
 +  Add 'Short Etch' code for Cicada PHY within 440gx_enet.c
 +  Patch by Travis B. Sawyer, 12 Jul 2005
 +
  ======================================================================
  Changes for U-Boot 1.1.3:
  ======================================================================