diff options
author | Wolfgang Denk <wd@denx.de> | 2009-12-07 23:42:33 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-12-07 23:42:33 +0100 |
commit | 35e3717772c8c3534c18d8aac69e4b822777c23b (patch) | |
tree | 9fa7a1e24f670772cc8d026a15d63ddf85a36810 /Makefile | |
parent | 7cb5fc15f22de46cc6fabc26baf994cf8f7fa546 (diff) | |
parent | 0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff) | |
download | u-boot-imx-35e3717772c8c3534c18d8aac69e4b822777c23b.zip u-boot-imx-35e3717772c8c3534c18d8aac69e4b822777c23b.tar.gz u-boot-imx-35e3717772c8c3534c18d8aac69e4b822777c23b.tar.bz2 |
Merge branch 'master' of ../work into next
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -24,7 +24,7 @@ VERSION = 2009 PATCHLEVEL = 11 SUBLEVEL = -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else |