Merge branch 'perf/core' into perf/probes
authorIngo Molnar <mingo@elte.hu>
Fri, 23 Oct 2009 06:23:20 +0000 (08:23 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Oct 2009 06:23:20 +0000 (08:23 +0200)
commit43315956509ca6913764861ac7dec128b91eb1ec
tree60fd5647f150a46e63093a41417c2eef3e776b3d
parent9bf4e7fba8006d19846fec877b6da0616b2772de
parent6beba7adbe092e63dfe8d09fbd1e3ec140474a13
Merge branch 'perf/core' into perf/probes

Conflicts:
tools/perf/Makefile

Merge reason:

 - fix the conflict
 - pick up the pr_*() infrastructure to queue up dependent patch

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
include/linux/ftrace_event.h
include/trace/ftrace.h
include/trace/syscall.h
kernel/trace/trace.h
kernel/trace/trace_events.c
kernel/trace/trace_export.c
kernel/trace/trace_syscalls.c
tools/perf/Makefile
tools/perf/perf.c