summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-06 15:44:39 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-06 15:44:39 -0700
commitdbd43d08642c037beb937c2670976c076120507b (patch)
tree4d44a4b54a731eb290e040345c38ed9e1e7ecc6a /Makefile
parentc34c07d6946ec8969fa71ba03dbb95091f4eb9d3 (diff)
parent9f737633e6ee54fc174282d49b2559bd2208391d (diff)
downloadlinux-stable-dbd43d08642c037beb937c2670976c076120507b.tar.gz
linux-stable-dbd43d08642c037beb937c2670976c076120507b.tar.bz2
linux-stable-dbd43d08642c037beb937c2670976c076120507b.zip
Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 110db856e966..c2f78a5a5493 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 18
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
NAME=Crazed Snow-Weasel
# *DOCUMENTATION*