summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2015-03-10 09:03:04 -0500
committerRob Herring <robh@kernel.org>2015-03-10 09:03:04 -0500
commit2c192699a7050ef5bdf1e2cc95fdddfbcf524509 (patch)
tree945d4553691ecb24151a2fa83b7d489665dd3248 /Makefile
parent25e8f336e535d10c30216e1ba330fbea98dfccc5 (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
Merge tag 'v4.0-rc3' into HEAD
Linux 4.0-rc3 Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix console name size mismatch) is a dependency.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9fab639727c7..1100ff3c77e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 0
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc3
NAME = Hurr durr I'ma sheep
# *DOCUMENTATION*