Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy...

[linux-2.6] / Makefile

diff --git a/Makefile b/Makefile
index 717b9b9..3d84df5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 13
-EXTRAVERSION =-rc4
-NAME=Woozy Numbat
+EXTRAVERSION =
+NAME=Affluent Albatross
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"