summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-02 20:22:10 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-02 20:22:10 -0700
commit6246b6128bbe34d0752f119cf7c5111c85fe481d (patch)
tree0ecfe3dbc2e65aa9638c62abf0cf05057c77f884
parent6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 (diff)
Linux v2.6.17-rc1v2.6.17-rc1
Close of the merge window..
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index af6210d4883..b4019426fa2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 16
-EXTRAVERSION =
+SUBLEVEL = 17
+EXTRAVERSION =-rc1
NAME=Sliding Snow Leopard
# *DOCUMENTATION*