From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 24 Aug 2006 22:13:37 +0000 (+0200)
Subject: Merge with /home/tur/proj/fo300/u-boot
X-Git-Tag: U-Boot-1_1_5~52
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15f29f06ed207ac651d7d871403d1944a6960b89;p=u-boot

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

15f29f06ed207ac651d7d871403d1944a6960b89
diff --cc CHANGELOG
index 7975cf38a0,3c752d1599..b6dc06784c
--- a/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.