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

diff --cc CHANGELOG
index 46e77e7c462b760dbf552f72b9d05a347e60b0cc,f09be8a1c161955a017726b25e694928b7b1f481..02ccd30a3e704e0b8298770fe65d376b47faca51
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,21 +2,23 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * PCIe endpoint support for AMCC Yucca 440SPe board
+   Patch by Tirumala R Marri, 26 Aug 2006
+ 
+ * Improve DIMM detection for AMCC Yucca 440SPe board
+   Improved the memory DIMM detection for the Yucca 440SPe board for
+   the case where a memory DIMM is falsely detected as present.
+   This issue is seen on some AMCC Yucca 440SPe validation boards if
+   only one 512MB memory DIMM is installed, i.e. DIMM slot 0 is
+   populated and DIMM slot 1 is empty.  In this case, U-Boot does
+   not correctly detect that there is only one DIMM memory module
+   installed and will falsely detect two DIMM memory modules are
+   present and therefore U-Boot will not calculate the correct amount
+   of total memory and u-boot will not booting up.
+   Patch by Adam Graham, 24 Aug 2006
+ 
 +* Fix typo.
 +
  * Code cleanup
  
  * Update for MCC200 / PRS200 boards: