From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 18 Aug 2006 13:23:10 +0000 (+0200)
Subject: Merge with /home/raj/git/u-boot
X-Git-Tag: U-Boot-1_1_5~56
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=c5185470fef2d4d94e78f57e92f3d88b7d11857c;p=karo-tx-uboot.git

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

c5185470fef2d4d94e78f57e92f3d88b7d11857c
diff --cc CHANGELOG
index ff6eadb1fd,05d33b4e2d..e40de36746
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,21 -2,8 +2,23 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix TQM834x hang.
+ 
 +* Update for SC520 board.
 +  Patch by David Updegraff, 02 Dec 2005
 +
 +* Fixed common.h spelling error.
 +  Patch by Cory Tusar, 30 Nov 2005
 +
 +* Fix typo.
 +  Patch by Andreas Engel, 28 Nov 2005
 +
 +* Fix fatload command on FAT32 formatted partitions.
 +  Patch by Joachim Jaeger, 18 Nov 2005
 +
 +* Fix drivers/dm9000.c when configured in 32 bit mode.
 +  Patch by Eric Benard, 17 Nov 2005
 +
  * Cleanup debug code for yucca board.
  
  * MCC200: restrict addressable flash space to 32 MB