From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 13 Sep 2006 08:25:40 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot/denx
X-Git-Tag: U-Boot-1_1_5~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d5269f87fc00a3fe1960cacd92e3d04864dff7d;p=oweals%2Fu-boot.git

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

5d5269f87fc00a3fe1960cacd92e3d04864dff7d
diff --cc CHANGELOG
index 4e9cf16489,9840863bf7..786f01b64e
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,9 -2,13 +2,15 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * 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 
+ * Add documentation on the latest build environment extensions to
    the README file.
  
  * Remove dead code (i2o and dma) from cpu/mpc824x/drivers/ directory.