From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 14 Sep 2005 15:06:43 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: LABEL_2005_09_15_2320~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3edb0ccf61ab495edf400f8baf1a2d333ae2fe1c;p=kernel%2Fu-boot.git

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

3edb0ccf61ab495edf400f8baf1a2d333ae2fe1c
diff --cc CHANGELOG
index 616896c,b377507..7c2bdab
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,10 -2,10 +2,14 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Fix problem in 440GP ethernet driver (ebony). Add support for 2nd
+   ethernet port on ebony.
+   Patch by Stefan Roese, 7 Sep 2005
+ 
 +* Added support for mtddevnum and mtddevname variables (mtdparts command)
 +
 +* Change default console baud rate for stxxtc board
 +
  * Add I2C support to TQM8540 and TQM8560 boards (EEPROM, RTC, LM75-DTT).
    Patch by Stefan Roese, 31 Aug 2005