summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-09-14 07:07:18 +1000
committerPaul Mackerras <paulus@samba.org>2006-09-14 07:07:18 +1000
commitc547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch)
tree34af1fa64a63618660187ae58ad182665a1861ef /Makefile
parent3dd836a56de0d4f049438412959b905e1db4666e (diff)
parent63b98080daa35f0d682db04f4fb7ada010888752 (diff)
downloadlinux-3.10-c547fc28ab3e8716076fdaf4bd0260c5d63a18f7.tar.gz
linux-3.10-c547fc28ab3e8716076fdaf4bd0260c5d63a18f7.tar.bz2
linux-3.10-c547fc28ab3e8716076fdaf4bd0260c5d63a18f7.zip
Merge branch 'linux-2.6'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 33559b56644..eab5a8c2ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 18
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc7
NAME=Crazed Snow-Weasel
# *DOCUMENTATION*