Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 13 Jan 2010 08:58:37 +0000 (09:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 13 Jan 2010 09:08:50 +0000 (10:08 +0100)
commit61405fea92c42d072d9b8bd189689f1502a838af
tree013ea3e7ed71f4114004d5852d40b6e89e128f76
parent9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b
parent1703f2c321a8a531c393e137a82602e16c6061cb
Merge branch 'perf/urgent' into perf/core

Merge reason: queue up dependent patch, update to -rc4

Signed-off-by: Ingo Molnar <mingo@elte.hu>
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