summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-14 02:14:23 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-14 02:14:23 +0100
commitcc016448b0bf0764928275d034e367753bde8162 (patch)
tree30816bd7a8e3bd5157b186f0a5f56fa0ec1ccb0b /Makefile
parent[NETFILTER]: bridge-netfilter: remove deferred hooks (diff)
downloadlinux-cc016448b0bf0764928275d034e367753bde8162.tar.xz
linux-cc016448b0bf0764928275d034e367753bde8162.zip
Linux v2.6.20-rc1v2.6.20-rc1
.. and so the stabilization phase starts. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f732e75be43d..dc82462b68ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 19
-EXTRAVERSION =
+SUBLEVEL = 20
+EXTRAVERSION =-rc1
NAME=Avast! A bilge rat!
# *DOCUMENTATION*