summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-30 01:04:48 +0200
committerWolfgang Denk <wd@denx.de>2010-06-30 01:04:48 +0200
commit55357b7846237d12aa5f07aec657c5dbfaf790ed (patch)
treed95879d513876d874e320b42c3dd32d6d3d02f35 /Makefile
parente5ed138a23923ebe61843244748d98d3dbc04777 (diff)
parentbde3892edac99bf974e5b9809a112a6ce530be03 (diff)
downloadu-boot-imx-55357b7846237d12aa5f07aec657c5dbfaf790ed.zip
u-boot-imx-55357b7846237d12aa5f07aec657c5dbfaf790ed.tar.gz
u-boot-imx-55357b7846237d12aa5f07aec657c5dbfaf790ed.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 87d5214..d7a6921 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 2010
PATCHLEVEL = 06
SUBLEVEL =
-EXTRAVERSION = -rc3
+EXTRAVERSION =
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else