diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-03-12 20:44:07 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-03-12 20:44:11 +0100 |
commit | 35239e23c66f1614c76739b62a299c3c92d6eb68 (patch) | |
tree | 7b1e068df888ec9a00b43c1dd7517a6490da6a94 /arch/mips/kernel/perf_event.c | |
parent | x86/kprobes: Split out optprobe related code to kprobes-opt.c (diff) | |
parent | perf/x86: Fix local vs remote memory events for NHM/WSM (diff) | |
download | linux-35239e23c66f1614c76739b62a299c3c92d6eb68.tar.xz linux-35239e23c66f1614c76739b62a299c3c92d6eb68.zip |
Merge branch 'perf/urgent' into perf/core
Merge reason: We are going to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions