From: Wolfgang Denk <wd@pollux.denx.de>
Date: Mon, 3 Oct 2005 13:42:25 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: LABEL_2006_03_12_0025~123
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d843a575d705637cb2d70520070a8671b58e2a76;p=u-boot

Merge with /home/wd/git/u-boot/master
---

d843a575d705637cb2d70520070a8671b58e2a76
diff --cc CHANGELOG
index 24a43cba07,cfea3c045c..6b6465e596
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,9 +2,11 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Change board message on AMCC Yosemite & Yellowstone to common style
+   Patch by Stefan Roese, 3 Oct 2005
+ 
 +* Fix compiler warning
 +
  * Fix FEC PHY addresses for TQM85xx boards
  
  * Fix uninitialized variable problem in hush shell