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

diff --cc CHANGELOG
index 616896c,b377507..7c2bdab
--- 1/CHANGELOG
--- 2/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