aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-15 17:41:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-15 17:41:37 -0700
commitda5cabf80e2433131bf0ed8993abc0f7ea618c73 (patch)
tree208f20750722e031b404f1447b22c5ffd0eed215
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (diff)
downloadlinux-dev-da5cabf80e2433131bf0ed8993abc0f7ea618c73.tar.xz
linux-dev-da5cabf80e2433131bf0ed8993abc0f7ea618c73.zip
Linux 2.6.36-rc1
Diffstat (limited to '')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 788111d21559..f3bdff8c8d78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 35
-EXTRAVERSION =
+SUBLEVEL = 36
+EXTRAVERSION = -rc1
NAME = Sheep on Meth
# *DOCUMENTATION*