Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / Makefile

diff --git a/Makefile b/Makefile
index cc77fd4..3a10a8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 5
 PATCHLEVEL = 12
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION =
 NAME = Frozen Wasteland
 
 # *DOCUMENTATION*