summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-06 02:57:02 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-06 02:57:02 +0200
commit1def630a6a49dda5bc89dfbd86656293640456f0 (patch)
tree1378337832318d83868ff6488cd90fe0d38c6f35
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-1def630a6a49dda5bc89dfbd86656293640456f0.tar.xz
linux-1def630a6a49dda5bc89dfbd86656293640456f0.zip
Linux 2.6.17-rc6v2.6.17-rc6
-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"