diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 13:11:42 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 13:11:42 +0400 |
commit | f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch) | |
tree | 0816c565d26ae24854616faa0d497be365c2fe8b /Makefile | |
parent | ee4311adf105f4d740f52e3948acc1d81598afcc (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
download | linux-f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d.tar.xz |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 26 -EXTRAVERSION = -rc6 +EXTRAVERSION = -rc7 NAME = Rotary Wombat # *DOCUMENTATION* |