diff --git a/[refs] b/[refs]
index c293dd9cbba1..cdfbe9f88ee7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe5a2de17e65d82b9d502da80ccb5a689d03fdd2
+refs/heads/master: 7dcca30a32aadb0520417521b0c44f42d09fe05c
diff --git a/trunk/Makefile b/trunk/Makefile
index c6f7b71eae81..de4f8f7d396c 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 22
-EXTRAVERSION = -rc7
+EXTRAVERSION =
 NAME = Holy Dancing Manatees, Batman!
 
 # *DOCUMENTATION*