summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-20 03:08:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-20 03:08:38 +0200
commitf114040e3ea6e07372334ade75d1ee0775c355e1 (patch)
treeb794f25550b7dbbe9cc8eda81633df9023b4821c /Makefile
parentMerge tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-f114040e3ea6e07372334ade75d1ee0775c355e1.tar.xz
linux-f114040e3ea6e07372334ade75d1ee0775c355e1.zip
Linux 3.18-rc1v3.18-rc1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 36a77a3d156c..05d67af376c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
-PATCHLEVEL = 17
+PATCHLEVEL = 18
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc1
NAME = Shuffling Zombie Juror
# *DOCUMENTATION*