Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / Makefile

diff --git a/Makefile b/Makefile
index 654c31a..31c24d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 35
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc2-JMP-syslog-1
 NAME = Sheep on Meth
 
 # *DOCUMENTATION*