diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-05 11:18:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-05 12:26:50 +0200 |
| commit | 10b0256496fd6c162478547f7c6df1e052e87644 (patch) | |
| tree | 7037905737ae83a86a5cdb376cd1d66f7f407e2e /arch/x86/kernel/crash.c | |
| parent | Merge branch 'perf/uprobes' into perf/core (diff) | |
| parent | kprobes: Ensure blacklist data is aligned (diff) | |
| download | linux-10b0256496fd6c162478547f7c6df1e052e87644.tar.xz linux-10b0256496fd6c162478547f7c6df1e052e87644.zip | |
Merge branch 'perf/kprobes' into perf/core
Conflicts:
arch/x86/kernel/traps.c
The kprobes enhancements are fully cooked, ship them upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/crash.c')
0 files changed, 0 insertions, 0 deletions