commit 080bdb7f3a0227bc2f34a3b2d4e6f573dab3ca3a
author Wolfgang Denk <wd@pollux.denx.de> Wed Oct 05 01:51:29 2005 +0200
committer Wolfgang Denk <wd@pollux.denx.de> Wed Oct 05 01:51:29 2005 +0200
tree 25724dfd8332f647b9a7765d204112dcadf83e63
parent 29ca46c4453c41e0617b76248cae3be628e03cc2

* Move dm9161.c and lxt972.c into cpu/arm920t/at91rm9200
  Patch by Anders Larsen, 29 Apr 2005

* Fix problems introduced by Patch by Steven Scholz, 02 Mar 2005
  (8e2be51de8dd03c1ce4d06cbb18ad06133d47cd5)

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 144c53b..6d0ef81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix problems introduced by Patch by Steven Scholz, 02 Mar 2005
+  (8e2be51de8dd03c1ce4d06cbb18ad06133d47cd5)
+
+* Move dm9161.c and lxt972.c into cpu/arm920t/at91rm9200
+  Patch by Anders Larsen, 29 Apr 2005
+
 * Fix device partition intialization for SystemACE disks.
   Patch by Stephen Williams, 28 Apr 2005