summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-22 23:27:24 +0100
committerWolfgang Denk <wd@denx.de>2010-03-22 23:27:24 +0100
commit859500a2be94bfa77a845b9c8a4c499587035fd5 (patch)
tree986cd224308690760453635e60038091a3a928a4 /Makefile
parentb46b353b901a45ebe860f8bf874ca99f018cd410 (diff)
parent152dda3d94e97ede7af3f9560a59a659384d4585 (diff)
downloadu-boot-imx-859500a2be94bfa77a845b9c8a4c499587035fd5.zip
u-boot-imx-859500a2be94bfa77a845b9c8a4c499587035fd5.tar.gz
u-boot-imx-859500a2be94bfa77a845b9c8a4c499587035fd5.tar.bz2
Merge remote branch 'origin/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 5147df7..398e94d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 2010
PATCHLEVEL = 03
SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else