Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

[sfrench/cifs-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index 619a85ad716b43e2aafa080eb5e85da9516d5459..ba3106b3659783c563d84cf6683960d18a23bcf3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
 VERSION = 4
 PATCHLEVEL = 17
 SUBLEVEL = 0
-EXTRAVERSION = -rc3
-NAME = Fearless Coyote
+EXTRAVERSION = -rc5
+NAME = Merciless Moray
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"