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

diff --cc CHANGELOG
index 5296daf03e1d15143be9ee6858149fee9f0b46d5,51974add9528917b6260f6eabdbb43223be8f3ed..6bd7329d4af0e9e751c5975d3d1e2c506945249d
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,11 +2,13 @@@
  Changes for U-Boot 1.1.3:
  ======================================================================
  
+ * Changed CONFIG_440_GX, CONFIG_440_EP and CONFIG_440_GR options to
+   CONFIG_44GX, CONFIG_440EP and CONFIG_440GR for a consistent design
+   with the 405 defines and the linux kernel defines.
+   Patch by Stefan Roese, 08 Aug 2005
+ 
 +* Fix compiler warnings with older GCC versions
 +
  * Add common (with Linux) MTD partition scheme and "mtdparts" command
  
    Old, obsolete and duplicated code was cleaned up and replace by the