summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-16 23:17:36 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-16 23:17:36 +0200
commite40152ee1e1c7a63f4777791863215e3faa37a86 (patch)
tree434d237e8e6fdac43ae4a4a54bc69a24d9a4f088 /Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-e40152ee1e1c7a63f4777791863215e3faa37a86.tar.xz
linux-e40152ee1e1c7a63f4777791863215e3faa37a86.zip
Linus 2.6.34v2.6.34
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 701bc65b3952..ebc8225f7a96 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 34
-EXTRAVERSION = -rc7
+EXTRAVERSION =
NAME = Sheep on Meth
# *DOCUMENTATION*