Merge branch 'upstream-fixes' into upstream

[pandora-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 33559b5..eab5a8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 18
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc7
 NAME=Crazed Snow-Weasel
 
 # *DOCUMENTATION*