]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 7 May 2010 09:30:29 +0000 (11:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 7 May 2010 09:30:30 +0000 (11:30 +0200)
commit2e27c1bc2f1da99fb9db84cc0800cf45adabdd69
tree25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f
parentcc2859926ddaa7afb62002bce8c95956f3535639
parent53af961d25d3ef6342bac15020d337fdd9ec74d1
Merge branch 'perf/urgent' into perf/core

Merge reason: Resolve patch dependency

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/perf_event.h
kernel/perf_event.c
kernel/sched.c