summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-07 23:42:33 +0100
committerWolfgang Denk <wd@denx.de>2009-12-07 23:42:33 +0100
commit35e3717772c8c3534c18d8aac69e4b822777c23b (patch)
tree9fa7a1e24f670772cc8d026a15d63ddf85a36810 /Makefile
parent7cb5fc15f22de46cc6fabc26baf994cf8f7fa546 (diff)
parent0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff)
downloadblackbird-obmc-uboot-35e3717772c8c3534c18d8aac69e4b822777c23b.tar.gz
blackbird-obmc-uboot-35e3717772c8c3534c18d8aac69e4b822777c23b.zip
Merge branch 'master' of ../work into next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f5a55c703f..75b2c1e458 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 2009
PATCHLEVEL = 11
SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else
OpenPOWER on IntegriCloud