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

diff --cc CHANGELOG
index 24a43cba0703daab20214e0a54072eb8f0bfcd64,cfea3c045c6477c8e091a3d62d1bbe86169b3f49..6b6465e5964004006f7ce6772b7881f6e14f1a2b
--- 1/CHANGELOG
--- 2/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