summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-06-06 16:31:26 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-06-06 16:31:26 +0200
commit4b01abc977574253f466f65463019de2571c6401 (patch)
treec330615fe9f277ad51a91da3db2d690a3336fb02 /Makefile
parent[GFS2] Change name due to local_nodeid being a macro (diff)
parentLinux 2.6.17-rc6 (diff)
downloadlinux-4b01abc977574253f466f65463019de2571c6401.tar.xz
linux-4b01abc977574253f466f65463019de2571c6401.zip
Merge branch 'master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 435d209f42d8..a3a7baad8555 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 17
-EXTRAVERSION =-rc5
-NAME=Lordi Rules
+EXTRAVERSION =-rc6
+NAME=Crazed Snow-Weasel
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"