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

diff --cc CHANGELOG
index 67824926e51eaf8f48644d306d2233821b9c50bc,e451b517a4a86803478b0509a9429021e3351cde..24499c5621a3c7c11680a82fe9843ce212299eed
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,23 -2,19 +2,36 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix control-c handing in CONFIG_CMDLINE_EDITING
+   Properly pass break code back from readline.
+   Patch by Roger Blofeld, 31 Jul 2006
+ 
+ * Add commandline history support to all AMCC eval boards
+   Patch by Stefan Roese, 07 Aug 2006
+ 
+ * Add Macronix MXLV320T flash support for AMCC Bamboo
+   Patch by Stefan Roese, 07 Aug 2006
+ 
+ * Change "mii info" to not print an error upon missing PHY at address
+   Patch by Stefan Roese, 07 Aug 2006
+ 
 +* Fix PCI-Express on PPC440SPe rev. A.
 +
 +* Fix preboot message on TQM85xx after switching to hush parser.
 +
 +* Adapt TQM85xx ramdisk address to Linux kernel memory map
 +
 +* Add initial support for PCI-Express on PPC440SPe (Yucca board).
 +
 +* Fix compiler warning for TRAB board.
 +  Patch by Martin Krause, 07 Aug 2006
 +
 +* Prevent USB commands from working when USB is stopped.
 +
 +* Add rudimentary handling of alternate settings of USB interfaces.
 +  This is in order to fix issues with some USB sticks timing out
 +  during initialization. Some code readability improvements.
 +
  * PPC440 DDR setup: Set SDRAM0_CFG0[PMU]=0 for best performance
    AMCC suggested to set the PMU bit to 0 for best performace on
    the PPC440 DDR controller.

diff --cc include/configs/yucca.h
Simple merge