aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-17 00:52:58 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-17 00:52:58 -0800
commitcc8b6e45dd635d698cd4ef28aa6ccc704a23cd72 (patch)
tree15234240ccf7b03bf6cba591404cf94ee3002da4
parentMerge bk://kernel.bkbits.net/gregkh/linux/merge-2.6 (diff)
downloadhistory-2.6.12-rc1.tar.gz
history-2.6.12-rc1.zip
Linux 2.6.12-rc1v2.6.12-rc1
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fbe0fd77b5..0e5fd7a04e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 11
-EXTRAVERSION =
+SUBLEVEL = 12
+EXTRAVERSION =-rc1
NAME=Woozy Numbat
# *DOCUMENTATION*