summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-05 00:45:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-05 00:45:10 +0200
commitddf28352b80c86754a6424e3a61e8bdf9213b3c7 (patch)
tree5e93bc5b7dae99395557dc7150a3f53a80bba92a /Makefile
parentMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff)
downloadlinux-ddf28352b80c86754a6424e3a61e8bdf9213b3c7.tar.xz
linux-ddf28352b80c86754a6424e3a61e8bdf9213b3c7.zip
Linux 3.1-rc5v3.1-rc5
Diffstat (limited to '')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c3e90c530a65..03d97aa8c73e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 1
SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc5
NAME = "Divemaster Edition"
# *DOCUMENTATION*