summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar2008-06-25 12:27:56 +0200
committerIngo Molnar2008-06-25 12:27:56 +0200
commit97e6722b8d6b5880c4d5751127d5083b1b7df27d (patch)
tree060c52298d42530f975064f7addc4e637fe00289 /Makefile
parentftrace: avoid modifying kprobe'd records (diff)
parentLinux 2.6.26-rc8 (diff)
downloadkernel-qcow2-linux-97e6722b8d6b5880c4d5751127d5083b1b7df27d.tar.gz
kernel-qcow2-linux-97e6722b8d6b5880c4d5751127d5083b1b7df27d.tar.xz
kernel-qcow2-linux-97e6722b8d6b5880c4d5751127d5083b1b7df27d.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 ab73e496c8ee..ff2c681fb5dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26
-EXTRAVERSION = -rc7
+EXTRAVERSION = -rc8
NAME = Rotary Wombat
# *DOCUMENTATION*