summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-12-21 10:06:32 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-21 10:06:37 +0100
commit2d2b7749e8f9d32c16c599f85f2b1a51b76dddb7 (patch)
treebbad5e4c8e3baddb514c294523532671f3e1cf57 /Makefile
parent9ec84acee1e221d99dc33237bff5e82839d10cc0 (diff)
parent384703b8e6cd4c8ef08512e596024e028c91c339 (diff)
downloadlinux-2d2b7749e8f9d32c16c599f85f2b1a51b76dddb7.tar.bz2
Merge commit 'v3.2-rc6' into core/locking
Merge reason: Pick up 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 12aafc20efbd..a43733df3978 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 2
SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc6
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*