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

[karo-tx-uboot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index e5c53d80f836adf3518ed677dd038f5fd4fa2c10..015932e74db7cd15bf695fbaafa816fd00c708f8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,10 @@ Changes for U-Boot 1.1.4:
     the DDR.
   Patch by Steven Blakeslee, 12 Dec 2005
 
+* MPC5200:  Set PCI retry counter to 0 = infinite retry;
+  The default of 255 is too short for slow devices.
+  Patch by Martin Nykodym, 12 Dec 2005
+
 * Change port configuration for O2DNT (CODEC1 on PSC1).
 
 * Fix register for PCI async mode on PPC440EP