summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-28 04:13:32 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-28 04:13:32 +0200
commit434f1d10c1adb6c2e333d501ce1e42be610e0723 (patch)
treea43f1e6f40ea1530e648ae72709a2c45442891aa /Makefile
parentRPC: Ensure that nobody can queue up new upcalls after rpc_close_pipes() (diff)
parentLinux v2.6.14 (diff)
downloadlinux-434f1d10c1adb6c2e333d501ce1e42be610e0723.tar.xz
linux-434f1d10c1adb6c2e333d501ce1e42be610e0723.zip
Merge /home/trondmy/scm/kernel/git/torvalds/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 4a7000e353b5..1fa7e5343464 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 14
-EXTRAVERSION =-rc5
+EXTRAVERSION =
NAME=Affluent Albatross
# *DOCUMENTATION*