Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / Makefile

diff --git a/Makefile b/Makefile
index dfe3d1610a7b3a7495507e9e95d6109592be4af1..744bb0d573228e1a955a11de2750738263f21303 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc1
-NAME = Holy Dancing Manatees, Batman!
+EXTRAVERSION =-rc5
+NAME = Pink Farting Weasel
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"