Merge branches 'slab/next' and 'slub/partial' into slab/for-linus

[linux-beck.git] / Makefile

diff --git a/Makefile b/Makefile
index 522fa4784e69a65353fa83494fa3c4f105989c03..07bc92544e9cab9ea9fd201b8a5f36fb9dbb9168 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 1
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION =
 NAME = "Divemaster Edition"
 
 # *DOCUMENTATION*