From: Wolfgang Denk <wd@pollux.denx.de>
Date: Tue, 6 Sep 2005 20:17:16 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot:
X-Git-Tag: LABEL_2005_09_15_2320~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d244ea128819d78b208c3e53d4b464e4ce2df0f;p=kernel%2Fu-boot.git

Merge with /home/sr/git/u-boot:
Add I2C support for TQM85xx
---

5d244ea128819d78b208c3e53d4b464e4ce2df0f
diff --cc CHANGELOG
index 9ef8c38,ea4353d..da0a953
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,13 -2,11 +2,16 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Add I2C support to TQM8540 and TQM8560 boards (EEPROM, RTC, LM75-DTT).
 -  Removed CFG_CMD_DISPLAY from default commands.
 -  Fixed compiler warning in net.c.
+   Patch by Stefan Roese, 31 Aug 2005
+ 
 +* Fix default command set (don't include CFG_CMD_DISPLAY command)
 +  Patch by Pantelis Antoniou, 02 Sep 2005
 +
 +* Cleanup
 +
 +* Enable SM712 driver support for HMI1001 board.
 +
  * Fix problems with ld version 2.16 (dot outside sections problem)
    Pointed out by Gerhard Jaeger, 31 Aug 2005;
    cf. http://sourceware.org/ml/binutils/2005-08/msg00412.html