commit 4e53a25855701c312e84404e183e7159e0766a23
author Wolfgang Denk <wd@denx.de> Wed Oct 25 00:43:17 2006 +0200
committer Wolfgang Denk <wd@denx.de> Wed Oct 25 00:43:17 2006 +0200
tree 2c3f6d07c47f9cd08cd189a226744fdfaf4c0d84
parent 7c52c4b943ff52bbe8796a7e2d3e476ceaf3f512
parent af9e1f5b9e6f9ce810f5e8bf2961c9542a5865c2

Fix Makefile for "CHANGELOG" target
Merge with /home/sr/git/u-boot/4xx-idcr

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 10e4a96..1b8ca04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+commit 7c52c4b943ff52bbe8796a7e2d3e476ceaf3f512
+Author: Wolfgang Denk <wd@denx.de>
+Date:   Tue Oct 24 21:35:55 2006 +0200
+
+    Switch to automatically generated CHANGELOG file.
+    (use "make CHANGELOG" to update it from time to time)
+
 commit 7ade0c634a979c32fa91a74e8f5775f24651fbe6
 Author: Stefan Roese <sr@denx.de>
 Date:   Tue Oct 24 18:06:48 2006 +0200