summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-23 20:55:27 +0200
committerWolfgang Denk <wd@denx.de>2010-06-23 20:55:27 +0200
commite5ed138a23923ebe61843244748d98d3dbc04777 (patch)
treeded2a96024ec709d2c8d632e8814c8bcc9b05832 /Makefile
parenteb77c9bdeac3963f14d122cccaadcfa248124a0e (diff)
parent482126e27b3dbf0e69a6445da8b94b3551adf05d (diff)
downloadu-boot-imx-e5ed138a23923ebe61843244748d98d3dbc04777.zip
u-boot-imx-e5ed138a23923ebe61843244748d98d3dbc04777.tar.gz
u-boot-imx-e5ed138a23923ebe61843244748d98d3dbc04777.tar.bz2
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9a436fe..87d5214 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 2010
PATCHLEVEL = 06
SUBLEVEL =
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc3
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else