summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-08 19:45:44 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-08 19:45:44 +0100
commit57d54889cd00db2752994b389ba714138652e60c (patch)
tree86e37b65c811fdc6d9f2de3b50da3292eb28da1a /Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 (diff)
downloadlinux-57d54889cd00db2752994b389ba714138652e60c.tar.xz
linux-57d54889cd00db2752994b389ba714138652e60c.zip
Linux 2.6.34-rc1v2.6.34-rc1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1b24895212d8..08ff02da7ce3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 33
-EXTRAVERSION =
+SUBLEVEL = 34
+EXTRAVERSION = -rc1
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*