summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-06-27 11:20:46 +0200
committerIngo Molnar <mingo@kernel.org>2016-06-27 11:20:46 +0200
commit8114e90ea4deafc7c75c7b343225b485c21b6706 (patch)
tree046c9cd4967e2ea56eab9dcaf6ca6f601fa3deda /Makefile
parent9840b1ae45876bcca41b64007ac4a56a7cd14c73 (diff)
parent4c2e07c6a29e0129e975727b9f57eede813eea85 (diff)
downloadlinux-8114e90ea4deafc7c75c7b343225b485c21b6706.tar.bz2
Merge tag 'v4.7-rc5' into perf/core, to pick up fixes
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 4a1fe88d6839..938089d43748 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 7
SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc5
NAME = Psychotic Stoned Sheep
# *DOCUMENTATION*