From f293f3db75de9f48b2f018f94c03f67975246704 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Sep 2011 14:02:02 -0700
Subject: [PATCH] --- yaml --- r: 263770 b: refs/heads/master c:
 b6fd41e29dea9c6753b1843a77e50433e6123bcb 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 a72dfad701ea..3e4562af6ec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cb3ed17cb88f2f1fe1cf36c8d48bccd4d9f459e
+refs/heads/master: b6fd41e29dea9c6753b1843a77e50433e6123bcb
diff --git a/trunk/Makefile b/trunk/Makefile
index 03d97aa8c73e..522fa4784e69 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 1
 SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
 NAME = "Divemaster Edition"
 
 # *DOCUMENTATION*