summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-06 22:39:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-06 22:39:52 +0200
commitcb655d0f3d57c23db51b981648e452988c0223f9 (patch)
treed7eda9db9252f44c0755280de90f7ebc7ced0dfd
parentMerge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-cb655d0f3d57c23db51b981648e452988c0223f9.tar.xz
linux-cb655d0f3d57c23db51b981648e452988c0223f9.zip
Linux 2.6.36-rc7v2.6.36-rc7
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 471c49fd2f43..77b5c6ed0ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 36
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME = Sheep on Meth
# *DOCUMENTATION*