summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-12-20 20:32:03 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-20 20:32:11 +0100
commitd87f69a16eb2cb96459117b06949a560679002e4 (patch)
treebbb55b2bd2b6c9e8bd4067aa3279783cb6bd9028 /Makefile
parent124ba9403318d834ef21bcd899c22c870708d2c4 (diff)
parent384703b8e6cd4c8ef08512e596024e028c91c339 (diff)
Merge commit 'v3.2-rc6' into perf/core
Merge reason: Update with the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 361e4f00e6b..a43733df397 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 2
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc6
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*