summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-06 06:09:49 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-06 06:09:49 +0200
commit120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (patch)
tree8b4b4b93ae019446b012d7807f7d95c8e5c857a7
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-120bda20c6f64b32e8bfbdd7b34feafaa5f5332e.tar.xz
linux-120bda20c6f64b32e8bfbdd7b34feafaa5f5332e.zip
Linux 2.6.18-rc1v2.6.18-rc1
It's all good.
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 82f76a96cfe6..7c010f3325a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 17
-EXTRAVERSION =
+SUBLEVEL = 18
+EXTRAVERSION = -rc1
NAME=Crazed Snow-Weasel
# *DOCUMENTATION*