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

diff --cc CHANGELOG
index 5a84431,d7f0ca7..394cb14
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,12 +2,14 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
 +* Update default environment for INKA4x00 board.
 +
+ * Convert CPCI750 to use common CFI flash driver
+   Patch by Reinhard Arlt, 8 Feb 2006
+ 
+ * Various changes to esd HH405 board specific files
+   Patch by Matthias Fuchs, 07 Feb 2006
+ 
  * Cleanup U-Boot boot messages on ARM.
  
    To match the U-Boot user interface on ARM platforms to the U-Boot