aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Ingo Molnar <mingo@elte.hu> 2008-06-23 11:11:42 +0200
committerGravatar Ingo Molnar <mingo@elte.hu> 2008-06-23 11:11:42 +0200
commitf34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch)
tree0816c565d26ae24854616faa0d497be365c2fe8b /Makefile
parentftrace: build fix with gcc 4.3 (diff)
parentSlab: Fix memory leak in fallback_alloc() (diff)
downloadlinux-f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d.tar.gz
linux-f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d.tar.bz2
linux-f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d.zip
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index db164f69cffa..ab73e496c8ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME = Rotary Wombat
# *DOCUMENTATION*