diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-18 04:26:53 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-18 06:35:23 +0200 |
| commit | f0218b3e9974f06014b61be8987159f4a20e011e (patch) | |
| tree | 29a593c4d71ab18cb0c450a34e79bf6bea66877e /arch/x86/kernel/cpu/vmware.c | |
| parent | tracing: Comment the use of event_mutex with trace event flags (diff) | |
| parent | perf newt: Add single key shortcuts for zoom into DSO and threads (diff) | |
| download | linux-f0218b3e9974f06014b61be8987159f4a20e011e.tar.xz linux-f0218b3e9974f06014b61be8987159f4a20e011e.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6
Conflicts:
include/trace/ftrace.h
kernel/trace/trace_kprobe.c
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch/x86/kernel/cpu/vmware.c')
0 files changed, 0 insertions, 0 deletions