summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-23 10:56:55 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-23 10:56:55 +0200
commit1e2697b1ce312f76ecc70051b9298317a4f1f944 (patch)
treecbc4c2e87ce6270e6b0f7369a1d968cdf088d937 /Makefile
parent37aab38972a2dd971f52a01533c0678a0646294b (diff)
parent481c5346d0981940ee63037eb53e4e37b0735c10 (diff)
Merge branch 'linus' into kmemchecktip-kmemcheck-2008-06-23_08.59_Mon
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6923d669a4f6..2b4977c9844e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME = Rotary Wombat
# *DOCUMENTATION*