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

[~andy/linux] / Makefile

diff --git a/Makefile b/Makefile
index eb28ccb7a2c064bf3ec6076265a702220455cbe3..744bb0d573228e1a955a11de2750738263f21303 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc4
+EXTRAVERSION =-rc5
 NAME = Pink Farting Weasel
 
 # *DOCUMENTATION*