Merge with /home/tur/proj/fo300/u-boot

diff --cc CHANGELOG
index 7975cf38a0d91b3a125f9fa1a3bf2239bd2491b1,3c752d1599600e23a6f62b40d3bd2848693d6d4f..b6dc06784c7206ee79c53762e9e49738e59caea0
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,11 -2,8 +2,13 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Add a fix for a buggy USB device on the FO300 board.
+ 
 +* Updates for MCC200 / PRS200 boards:
 +  - support for configurations with SDRAM or DDR memory,
 +  - support for highboot and lowboot
 +  - adjusting environment definitions
 +
  * Add support for WTK FO300 board (TQM5200 based).
  
  * Fix TQM834x hang.

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