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

diff --cc CHANGELOG
index 4e9cf16489a34d6d9eeb0f1504479562020597fd,9840863bf7e6f11603e544398b03a7e1c26cbba5..786f01b64ed6353ff7354a9fd8ed7be321f12bc0
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,9 -2,13 +2,15 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
- * Add documentation on the latest build environment extensions to 
+ * Add NAND environment support for PPC440EPx Sequoia NAND boot config
+   Patch by Stefan Roese, 12 Sep 2006
+ 
+ * Update NAND boot documentation
+   Patch by Stefan Roese, 12 Sep 2006
+ 
 +* Fix alignment problem in "mtdparts" command
 +
+ * Add documentation on the latest build environment extensions to
    the README file.
  
  * Remove dead code (i2o and dma) from cpu/mpc824x/drivers/ directory.