summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-12-03 00:15:28 +0100
committerWolfgang Denk <wd@denx.de>2007-12-03 00:15:28 +0100
commit8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (patch)
tree60263d7cae4e70bcd499c1a67a0cfd958915d876
parent88fed9a120aabd6e0b684e2616cafca58aaa7f93 (diff)
Prepare for 1.3.1-rc1v1.3.1-rc1
Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--CHANGELOG24
-rw-r--r--Makefile4
2 files changed, 26 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 54f15596d8..015a4ac01b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,27 @@
+commit a5f601fd1b1278deae5aa9fc27a232b0d1c1c788
+Author: Wolfgang Denk <wd@denx.de>
+Date: Mon Nov 26 19:18:21 2007 +0100
+
+ Cleanup coding style; update CHANGELOG
+
+ Signed-off-by: Wolfgang Denk <wd@denx.de>
+
+commit 3deca9d44767efd1b83f4b701f0dbf21a7595f7b
+Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date: Sun Nov 25 22:39:25 2007 +0100
+
+ MAKEALL: add missing 512x boards in ppc
+
+ Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+commit a340c325e668ca7386c2276387681720be9c3757
+Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date: Sun Nov 25 18:45:47 2007 +0100
+
+ Makefile : fix tags ctags etags with new drivers organization
+
+ Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
commit 87ddedd6ad804427ce125ceaa076d7a4f74e9d5d
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sun Nov 25 18:45:47 2007 +0100
diff --git a/Makefile b/Makefile
index bfd4132c15..db3d1e8ef9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@
VERSION = 1
PATCHLEVEL = 3
-SUBLEVEL = 0
-EXTRAVERSION =
+SUBLEVEL = 1
+EXTRAVERSION = -rc1
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h