Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Wed, 13 Jan 2010 08:58:37 +0000 (09:58 +0100)]
Merge reason: queue up dependent patch, update to -rc4

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
include/linux/syscalls.h
include/trace/ftrace.h
init/Kconfig
kernel/perf_event.c
kernel/sched.c
kernel/trace/trace_kprobe.c
tools/perf/Makefile
tools/perf/builtin-kmem.c

Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge
Simple merge