Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[sfrench/cifs-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index b6c8790925bfe1f4c51442e06941f34207b0cc02..66ee8b803986548bf6d28b5a6efdf223343efbce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 20
-EXTRAVERSION =
+SUBLEVEL = 21
+EXTRAVERSION = -rc2
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*