summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-10 23:18:14 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-10 23:18:14 +0100
commit19af35546de68c872dcb687613e0902a602cb20e (patch)
treeda62de18e2bc6c535a6f9b84d788819868f7a7a8 /Makefile
parentMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-19af35546de68c872dcb687613e0902a602cb20e.tar.xz
linux-19af35546de68c872dcb687613e0902a602cb20e.zip
Linux 2.6.25-rc1v2.6.25-rc1
.. and I really need to call it something else. Maybe it is time to bring back the weasel series, since weasels always make me feel good about a kernel.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 89f2d8b5136d..c162370c7367 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 24
-EXTRAVERSION =
+SUBLEVEL = 25
+EXTRAVERSION = -rc1
NAME = Arr Matey! A Hairy Bilge Rat!
# *DOCUMENTATION*