Merge with /home/wd/git/u-boot/work

[karo-tx-uboot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 3be741c4a1cff01cdca03a425eef7dcbb16bda78..863759c49a67335a3a7cfd91aeb271878606a435 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,12 @@ Changes for U-Boot 1.1.4:
 * Fix autonegotiation in tsec ethernet driver
   Patch by Stefan Roese, 21 Sep 2005
 
+* Fix bug in auto_update (trab board)
+  Patch by Martin Krause, 16 Sep 2005
+
+* Fix computation of framebuffer palette for 8bpp LCD bitmaps
+  Patch by Francesco Mandracci, 16 Sep 2005
+
 * Update configuration for INKA4x0 board
 
 * Update configuration for PM854 board