diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:24:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:24:52 +0100 |
| commit | 855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525 (patch) | |
| tree | f95e80165c293f43321b17c4280acfca478d9ba8 /tools/perf/scripts/python | |
| parent | Merge branch 'irq/sparseirq' into cpus4096 (diff) | |
| parent | x86: disable IRQs before doing anything on nmi_shootdown_cpus() (diff) | |
Merge branch 'x86/crashdump' into cpus4096
Conflicts:
arch/x86/kernel/crash.c
Merged for semantic conflict:
arch/x86/kernel/reboot.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions