aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-12 14:02:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-12 14:02:02 -0700
commitb6fd41e29dea9c6753b1843a77e50433e6123bcb (patch)
tree0d361c31ba4e4d68517a9ea42a5a70b33db2267c /Makefile
parentMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff)
downloadlinux-dev-b6fd41e29dea9c6753b1843a77e50433e6123bcb.tar.xz
linux-dev-b6fd41e29dea9c6753b1843a77e50433e6123bcb.zip
Linux 3.1-rc6
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 03d97aa8c73e..522fa4784e69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 1
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = "Divemaster Edition"
# *DOCUMENTATION*