diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-24 10:36:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-24 10:36:07 -0500 |
| commit | 1263d736a9031f3d943819662d4bad727d64bf24 (patch) | |
| tree | c740e74d19a0ecadd00bbdb8ad4b5a6b8d297480 /arch/x86/kernel/kprobes.c | |
| parent | 184d3da8ef0ca552dffa0fdd35c046e058a2cf9a (diff) | |
| parent | 12eac0bf0461910ae6dd7f071f156f75461a37cf (diff) | |
Merge branch 'perf/bench' into perf/core
Merge reason: Looks mergable - ready it for the merge window.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/kprobes.c')
0 files changed, 0 insertions, 0 deletions