summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-23 18:04:07 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-23 18:04:07 +0900
commitc3144fc46f987413df10e83659f0bf1aad76f79e (patch)
treea09f3c13c32664a617d3981ae111436c3127ccc3 /Makefile
parent4f896ffca2b72f4b719746e7fbb0b623252e6ac9 (diff)
parentcc58f597afc63a57bb55ed97c2a72f7405320c93 (diff)
Merge branches 'sh/hwblk' and 'sh/pm-runtime'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index abcfa85f8f8..9c87e60d169 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 31
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*