aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-03-11 19:15:41 +0000
committerSteve French <sfrench@us.ibm.com>2008-03-11 19:15:41 +0000
commit5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch)
tree58718288a28cca121a94b681a7865473a10dfd64 /Makefile
parent55f78e1771f0886162edd441dd4f39c287779de2 (diff)
parentbaadac8b10c5ac15ce3d26b68fa266c8889b163f (diff)
Merge branch 'master' of /pub/scm/linux/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 ae78a31a9de..0eb23e5bfc8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 25
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc5
NAME = Funky Weasel is Jiggy wit it
# *DOCUMENTATION*