summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-25 03:19:28 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-25 03:19:28 +0100
commit99abfeafb5f2eea1bb481330ff37343e1133c924 (patch)
tree893b57076c708fc66e4798bb74a9e43f6eb5868d /Makefile
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-99abfeafb5f2eea1bb481330ff37343e1133c924.tar.xz
linux-99abfeafb5f2eea1bb481330ff37343e1133c924.zip
Linux 2.6.20-rc6v2.6.20-rc6
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 477f52e3c7f6..9e1adac8aa28 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 20
-EXTRAVERSION =-rc5
+EXTRAVERSION =-rc6
NAME = Homicidal Dwarf Hamster
# *DOCUMENTATION*