summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 17:43:36 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 17:43:36 -0800
commitcd52d1ee9a92587b242d946a2300a3245d3b885a (patch)
tree2327eb4ca9f4884e8e3817060e8128063a1b9c35 /Makefile
parent508862e493f1107d17fa5a0015084b1773ffc41e (diff)
downloadlinux-stable-cd52d1ee9a92587b242d946a2300a3245d3b885a.tar.gz
linux-stable-cd52d1ee9a92587b242d946a2300a3245d3b885a.tar.bz2
linux-stable-cd52d1ee9a92587b242d946a2300a3245d3b885a.zip
Linux v2.6.15-rc1v2.6.15-rc1
As per the new release rules: two weeks of merging, and then an -rc1 and calming down for the next release.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c041a4305cd2..8560b79268ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 14
-EXTRAVERSION =
+SUBLEVEL = 15
+EXTRAVERSION =-rc1
NAME=Affluent Albatross
# *DOCUMENTATION*