aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 16:38:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 16:38:10 -0700
commit0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (patch)
tree41f5f823d0569a81b22037e79c22d823933a63f1
parentMerge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc (diff)
downloadlinux-dev-0d7614f09c1ebdbaa1599a5aba7593f147bf96ee.tar.xz
linux-dev-0d7614f09c1ebdbaa1599a5aba7593f147bf96ee.zip
Linux 3.6-rc1
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8e4c0a7d402b..ddf5be952e45 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
-PATCHLEVEL = 5
+PATCHLEVEL = 6
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc1
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*