]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitea8f06d7574ec885f2550d12fd484bae9f06fddc
tree013ea3e7ed71f4114004d5852d40b6e89e128f76
parent5c3e8bc91b944ae3dda3a3a76f898a881ca16eee
parent4a0215187f93293be0789a13e97a003df798117a
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