Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus

[mirror_ubuntu-bionic-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 52c129725270c877902fff9272d6da33a820c2c2..bc7eb6ada9667966110849dc0cdeb3ca631caa7c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 3
 PATCHLEVEL = 18
 SUBLEVEL = 0
-EXTRAVERSION = -rc2
-NAME = Shuffling Zombie Juror
+EXTRAVERSION = -rc4
+NAME = Diseased Newt
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"