Merge branch 'fix/misc' into for-linus

[sfrench/cifs-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index b57e1f539e8348f0bb10e3c96f5fa7ab8f52ff61..739fd34a72a2422f14937ccd084f77d52edc0fc1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 30
-EXTRAVERSION = -rc6
-NAME = Vindictive Armadillo
+EXTRAVERSION = -rc7
+NAME = Man-Eating Seals of Antiquity
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"