Pull c2 into release branch

[linux-2.6] / Makefile

diff --git a/Makefile b/Makefile
index b6c8790925bfe1f4c51442e06941f34207b0cc02..1c018c468e153ac85079f90a209a9bb3a09c5671 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 20
-EXTRAVERSION =
-NAME = Homicidal Dwarf Hamster
+SUBLEVEL = 21
+EXTRAVERSION = -rc4
+NAME = Nocturnal Monster Puppy
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"