Merge branch 'pm-tools'

[linux-2.6-block.git] / Makefile

diff --git a/Makefile b/Makefile
index af6e5f893d56eaa4170414ba29655f832765b583..7b3ecdcdc6c1815ca6241a72b1967593a0335b41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 5
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION =
 NAME = Blurry Fish Butt
 
 # *DOCUMENTATION*