diff --git a/[refs] b/[refs]
index 1b88f6651010..be5798a46c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8110e16d42d587997bcaee0c864179e6d93603fe
+refs/heads/master: a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
diff --git a/trunk/Makefile b/trunk/Makefile
index a3c11d589681..bb9fff26f078 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -rc7
+EXTRAVERSION =
 NAME = Terrified Chipmunk
 
 # *DOCUMENTATION*