diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-16 21:01:19 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-16 21:01:19 -0700 |
| commit | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (patch) | |
| tree | 37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c /Makefile | |
| parent | 4d4faae65e115e327425cd514c1a35146a85166b (diff) | |
| parent | 5947f6999aafa7c54c1390983d264a8463dfea8e (diff) | |
| download | u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.zip u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.tar.gz u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.tar.bz2 | |
Merge branch 'origin' into kconfig-for-1.3.1
Conflicts:
drivers/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -24,7 +24,7 @@ VERSION = 1 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc4 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) VERSION_FILE = $(obj)include/version_autogenerated.h |