Merge branch 'linus' into core/percpu

[linux-2.6-omap-h63xx.git] / Makefile

diff --git a/Makefile b/Makefile
index 27fb890a2bffe029236a2199637518bdaf951c6c..c40d83aedebef6cddffa500c6c97271340a79a21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*