diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-02 20:09:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-02 20:09:50 +0100 |
| commit | a64d31baed104be25305e9c71585d3ea4ee9a418 (patch) | |
| tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /Makefile | |
| parent | sched: convert struct root_domain to cpumask_var_t, fix (diff) | |
| parent | Linux 2.6.28-rc7 (diff) | |
| download | linux-a64d31baed104be25305e9c71585d3ea4ee9a418.tar.xz linux-a64d31baed104be25305e9c71585d3ea4ee9a418.zip | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/trace/ring_buffer.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 28 -EXTRAVERSION = -rc6 -NAME = Killer Bat of Doom +EXTRAVERSION = -rc7 +NAME = Erotic Pickled Herring # *DOCUMENTATION* # To see a list of typical targets execute "make help" |