Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[deliverable/linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 5f05f8cbeda4bf680fcec831e3d92054ff20ed9d..701bc65b3952fdae5964caffad108cfbca672131 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 34
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Sheep on Meth
 
 # *DOCUMENTATION*