Merge with git+ssh://fifi/home/wd/git/u-boot/master

diff --cc CHANGELOG
index ab3c59049bc5bb6528874b6f0c48e02dacd8eb1a,2059b66038b68e436637f4b37c28dddf8baf33cd..31233b789206fe30057a0dd234cc58b6820eaeae
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,18 -2,9 +2,21 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix comments in include/ppc440.h
+   Patch by Martin Hicks, 16 Jun 2006
+ 
 +* Update for CAM5200 board:
 +  - Map in a additional chip selects CS4 and CS5.
 +  - Modify the port configration, configure six UARTs and no PCI,
 +    ATA and USB.
 +  - Add custom flash driver to handle specific byte swapping
 +
 +* Fix TLB setup for Ocotea board
 +  Patch by Stefan Roese, 30 Sep 2006
 +
 +* Fix reset problem in sequoia sdram init code
 +  Patch by Stefan Roese, 23 Sep 2006
 +
  * Disable autoboot abort for FO300 when silent mode is enabled
    (according to S1 switch setting).