Merge branch 'linus' into x86/urgent, to refresh the tree

[deliverable/linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 7466de60ddc7ab98c66c7a28f3cd4a502f465411..0f9cb36d45c2c59a589670679e7fa1d25ff9ee59 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION =
 NAME = Charred Weasel
 
 # *DOCUMENTATION*