From eb361e64f6743b431185f743216cf25f9678be2b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 5 Jul 2006 21:09:49 -0700
Subject: [PATCH] --- yaml --- r: 32156 b: refs/heads/master c:
 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e h: refs/heads/master v: v3

---
 [refs]         | 2 +-
 trunk/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1296d86a49b4..c59ba814509f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 075d6adf909ac8706bd0be7832e6dadb0aef314b
+refs/heads/master: 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e
diff --git a/trunk/Makefile b/trunk/Makefile
index 82f76a96cfe6..7c010f3325a9 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 17
-EXTRAVERSION =
+SUBLEVEL = 18
+EXTRAVERSION = -rc1
 NAME=Crazed Snow-Weasel
 
 # *DOCUMENTATION*