From: Wolfgang Denk <wd@pollux.(none)>
Date: Thu, 22 Sep 2005 07:46:19 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/work
X-Git-Tag: DENX-2005-10-29-2350~91
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6e6cf00367c0779eadb49915e40c55f0a787957;p=kernel%2Fu-boot.git

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

a6e6cf00367c0779eadb49915e40c55f0a787957
diff --cc CHANGELOG
index 3be741c,909c416..863759c
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,20 -2,12 +2,26 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
 +* esd CPCI2DP board added
 +  Patch by Matthias Fuchs, 22 Sep 2005
 +
 +* esd PMC405 board updated
 +  Patch by Matthias Fuchs, 22 Sep 2005
 +
 +* Add SM501 support to HH405 board.
 +  Add support for gzip compressed bmp's (CONFIG_VIDEO_BMP_GZIP).
 +  Add support for eeprom write-enable (CFG_EEPROM_WREN).
 +  Patch by Stefan Roese, 22 Sep 2005
 +
 +* 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