Merge commit 'v2.6.29-rc1' into tracing/urgent

[safe/jmp/linux-2.6] / Makefile

diff --git a/Makefile b/Makefile
index 2833128..c06e250 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 28
-EXTRAVERSION =
+SUBLEVEL = 29
+EXTRAVERSION = -rc1
 NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*