From: Wolfgang Denk <wd@pollux.denx.de>
Date: Mon, 15 May 2006 13:24:43 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot/denx
X-Git-Tag: v2025.01-rc5-pxa1908~23033
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=df3eece32d8c3872161deeadd9a3a21923d93ce3;p=u-boot.git

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

df3eece32d8c3872161deeadd9a3a21923d93ce3
diff --cc CHANGELOG
index 1046036c6a,c07bb79f43..006cfac71f
--- a/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).