summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-11-27 23:11:18 +0100
committerWolfgang Denk <wd@denx.de>2006-11-27 23:11:18 +0100
commitd2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (patch)
treef00383ed01ca18fa0beee4930ebb7f3dc4153e5e /CHANGELOG
parent4f4b602ec7524a032bdf3c6d28c7f525a4a67eaa (diff)
parent1729b92cde575476684bffe819d0b7791b57bff2 (diff)
downloadu-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.zip
u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.tar.gz
u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.tar.bz2
Merge with /home/sr/git/u-boot/denx-alpr-merge-test
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e0766b7..4c9a744 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+commit 4f4b602ec7524a032bdf3c6d28c7f525a4a67eaa
+Author: Wolfgang Denk <wd@pollux.denx.de>
+Date: Mon Nov 27 22:53:53 2006 +0100
+
+ Update CHANGELOG
+
commit f6e495f54cdb8fe340b9c03deab40ad746d52fae
Author: Stefan Roese <sr@denx.de>
Date: Mon Nov 27 17:43:25 2006 +0100