Merge branches 'pm-devfreq-fixes' and 'pm-cpufreq-fixes'

[cascardo/linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 9ee5863..4fb6bea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 4
-PATCHLEVEL = 6
+PATCHLEVEL = 7
 SUBLEVEL = 0
-EXTRAVERSION =
-NAME = Charred Weasel
+EXTRAVERSION = -rc4
+NAME = Psychotic Stoned Sheep
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"