summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-26 23:39:02 +0300
committerMark Brown <broonie@kernel.org>2014-11-26 23:39:02 +0300
commit75ff9420448e7bb30ab8265463595e794ce0c3aa (patch)
treeea00f0cff2f6a272d60a518eb6dde6e14263b5b7 /Makefile
parent4524df83c7fc4f44702099a2db7b3cc938eb111f (diff)
parent206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff)
downloadlinux-75ff9420448e7bb30ab8265463595e794ce0c3aa.tar.xz
Merge tag 'v3.18-rc4' into regulator-max77686
Linux 3.18-rc4
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 05d67af376c5..bc7eb6ada966 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 0
-EXTRAVERSION = -rc1
-NAME = Shuffling Zombie Juror
+EXTRAVERSION = -rc4
+NAME = Diseased Newt
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"