diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
commit | 3784fd7316d336f2ba79b6c7c8168d08eff8a714 (patch) | |
tree | 3019c37f1ba588f252d1a9f1ef33beb5d3d683b1 /Makefile | |
parent | 7c440e7990ea22c0c374c59a5fbd79b0579d1517 (diff) | |
parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
download | linux-3784fd7316d336f2ba79b6c7c8168d08eff8a714.tar.gz linux-3784fd7316d336f2ba79b6c7c8168d08eff8a714.tar.bz2 linux-3784fd7316d336f2ba79b6c7c8168d08eff8a714.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 18 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME=Crazed Snow-Weasel # *DOCUMENTATION* |