From 3db020e13e7f2af2858f8e038cddd8a38de47f00 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 2 Jan 2006 19:21:10 -0800
Subject: [PATCH] --- yaml --- r: 15380 b: refs/heads/master c:
 88026842b0a760145aa71d69e74fbc9ec118ca44 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 607a28304b51..0dc2b500db71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f493d797bc1fe470377adc9d8775845427e240e
+refs/heads/master: 88026842b0a760145aa71d69e74fbc9ec118ca44
diff --git a/trunk/Makefile b/trunk/Makefile
index f937f1f4595e..497884d3d556 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 15
-EXTRAVERSION =-rc7
+EXTRAVERSION =
 NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*