summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 13:03:08 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-11 13:03:08 +0100
commitdf051434f1dfc93ec2e1c1d186bb87cb3db9dcdf (patch)
tree801d70ebcbabf9f4febfa0d4064227a0feb07c21 /Makefile
parent805194c35b91999b139e4d6b6145f4f84fd4c814 (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
Merge commit 'v2.6.29-rc1' into sched/urgent
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 28331288341f..c06e250eca18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 28
-EXTRAVERSION =
+SUBLEVEL = 29
+EXTRAVERSION = -rc1
NAME = Erotic Pickled Herring
# *DOCUMENTATION*