summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-23 23:47:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-23 23:47:00 +0200
commit59a3759d0fe8d969888c741bb33f4946e4d3750d (patch)
tree448952ca4953d40e0eff9b56884fe6c0023e6d34 /Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
downloadlinux-59a3759d0fe8d969888c741bb33f4946e4d3750d.tar.xz
linux-59a3759d0fe8d969888c741bb33f4946e4d3750d.zip
Linux 2.6.30-rc7v2.6.30-rc7
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b57e1f539e83..739fd34a72a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 30
-EXTRAVERSION = -rc6
-NAME = Vindictive Armadillo
+EXTRAVERSION = -rc7
+NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"