summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-30 01:02:11 +0200
committerWolfgang Denk <wd@denx.de>2010-06-30 01:02:11 +0200
commit0a9463e93537a68e7246714f43fb69eca0b7b214 (patch)
treecec01ecc6502a65cbbbda406dfac23b93c093899 /Makefile
parent955ea6fc2749a4305395758fc797cf8c11dcbed7 (diff)
parentbde3892edac99bf974e5b9809a112a6ce530be03 (diff)
downloadu-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.zip
u-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.tar.gz
u-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.tar.bz2
Merge branch 'master' into next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5490dd6..1d87f37 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