commit f2c2a937d8c4a44f63ff88bf82023e03a29497a2
author Wolfgang Denk <wd@denx.de> Mon Aug 06 01:11:08 2007 +0200
committer Wolfgang Denk <wd@denx.de> Mon Aug 06 01:11:08 2007 +0200
tree fa8f7c9fb65d10259e76c40c52cf8277947424d4
parent b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86
parent 5728be389e65fd47f34b33c2596271eb4db751ae

Merge with /home/wd/git/u-boot/custodian/u-boot-testing

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index f8a04e6..f00510b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+commit b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86
+Author: Wolfgang Denk <wd@denx.de>
+Date:	Thu Aug 2 21:27:46 2007 +0200
+
+    Coding style cleanup, update CHANGELOG
+
+    Signed-off-by: Wolfgang Denk <wd@denx.de>
+
 commit 8993e54b6f397973794f3d6f47d3b3c0c98dd4f6
 Author: Rafal Jaworowski <raj@semihalf.com>
 Date:	Fri Jul 27 14:43:59 2007 +0200