From: Wolfgang Denk <wd@pollux.(none)>
Date: Tue, 21 Feb 2006 15:41:43 +0000 (+0100)
Subject: Merge with /home/sr/git/u-boot
X-Git-Tag: LABEL_2006_03_12_0025~12^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=654c2d2836ff49c94a0bceb700701976e2682375;p=kernel%2Fu-boot.git

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

654c2d2836ff49c94a0bceb700701976e2682375
diff --cc CHANGELOG
index 5a84431,d7f0ca7..394cb14
--- a/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