summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-06-20 06:56:23 +0200
committerNathan Scott <nathans@sgi.com>2006-06-20 06:56:23 +0200
commit98174e46974323e4941c72e46345f7277755e146 (patch)
treec4644c8f38a519cfb3929d1175fc7107eefe48b9 /Makefile
parent[XFS] Remove files from the build that are now unused. (diff)
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-98174e46974323e4941c72e46345f7277755e146.tar.xz
linux-98174e46974323e4941c72e46345f7277755e146.zip
Merge HEAD from ../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 a3a7baad8555..1700d3f6ea22 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 17
-EXTRAVERSION =-rc6
+EXTRAVERSION =
NAME=Crazed Snow-Weasel
# *DOCUMENTATION*