From 62659b772797f915fe62e7b47475ea27f50e522c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 11 Nov 2005 17:43:36 -0800 Subject: [PATCH] --- yaml --- r: 13991 b: refs/heads/master c: cd52d1ee9a92587b242d946a2300a3245d3b885a h: refs/heads/master i: 13989: ecf599f3eaba43e71a1e61da396d58b4754c519b 13987: 2f2417ecc301426a7f69592308439acf23625f65 13983: 9a25a051899bedd7f5493c2ade8f57993f1572f7 v: v3 --- [refs] | 2 +- trunk/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3782bbb9874a..5d188bdde2d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 508862e493f1107d17fa5a0015084b1773ffc41e +refs/heads/master: cd52d1ee9a92587b242d946a2300a3245d3b885a diff --git a/trunk/Makefile b/trunk/Makefile index c041a4305cd2..8560b79268ba 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 14 -EXTRAVERSION = +SUBLEVEL = 15 +EXTRAVERSION =-rc1 NAME=Affluent Albatross # *DOCUMENTATION*