Merge branch 'topic/pcxhr-update' into to-push

[deliverable/linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 7b1f2384094f84cb8d9473f17a184aefbae5fcac..71e98e9e6acd3fd69d868843a000e7d8fc0363f2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 28
-EXTRAVERSION = -rc6
-NAME = Killer Bat of Doom
+EXTRAVERSION =
+NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"