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

diff --cc CHANGELOG
index 1046036c6a1eff25a334d8a69aa2563b9f048da6,c07bb79f439b5b7c82d93918fc4863d8f09971ea..006cfac71fe97b024990bc768b38e6b76bbb9889
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,9 +2,11 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Changed default ramdisk addr in yosemite/yellowstone ports
+   Patch by Stefan Roese, 15 May 2006
+ 
 +* Fix PCMCIA support on virtlab2
 +
  * Add support for VirtLab2 board
    (needed because of differences in the PCMCIA hardware).