summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-03-21 11:03:10 +0100
committerIngo Molnar <mingo@kernel.org>2013-03-21 11:03:10 +0100
commit3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch)
tree80a0499e57a4cc95b6caea559400b5226ebe606f /Makefile
parent86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff)
parentfd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff)
downloadlinux-stable-3bf2391729822e591dcfbbd1e9dd2f450968cdcb.tar.gz
linux-stable-3bf2391729822e591dcfbbd1e9dd2f450968cdcb.tar.bz2
linux-stable-3bf2391729822e591dcfbbd1e9dd2f450968cdcb.zip
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development bits from Arnaldo - which will involve merge conflicts. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5bd9f7700eb9..a05ea42c5f18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 9
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Unicycling Gorilla
# *DOCUMENTATION*