aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 13:21:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 13:21:02 -0700
commit67a3e12b05e055c0415c556a315a3d3eb637e29e (patch)
tree129a2431aae7c67fd8be56c1d16359ba83922cf2 /Makefile
parent3b03117c5cfbb04175b688c79ea4155b8ef812d3 (diff)
Linux 2.6.35-rc1v2.6.35-rc1
.. and thus endeth the merge window.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ebc8225f7a9..6e39ec701cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 34
-EXTRAVERSION =
+SUBLEVEL = 35
+EXTRAVERSION = -rc1
NAME = Sheep on Meth
# *DOCUMENTATION*