summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-08-09 16:20:49 -0500
committerJames Bottomley <jejb@titanic.(none)>2005-08-09 16:20:49 -0500
commit471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch)
treeac026ba976bc253fc87a5cdec8f33d24d03e1c9c /Makefile
parent20e007b8cc1266ff78810457d6e26c35c6b810ba (diff)
parentdb29e85a7ece62de1899917c1ec0ffe55cf1d3a0 (diff)
Merge ../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 0196b209bb1..2c1486159d8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 13
-EXTRAVERSION =-rc5
+EXTRAVERSION =-rc6
NAME=Woozy Numbat
# *DOCUMENTATION*