Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[sfrench/cifs-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index 562a90902cf698cc34e6e804ffdd9e20ed54828f..c6f7b71eae81a25a13bb99d13c52c1dc7083d6b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 22
-EXTRAVERSION = -rc3
-NAME = Jeff Thinks I Should Change This, But To What?
+EXTRAVERSION = -rc7
+NAME = Holy Dancing Manatees, Batman!
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"