]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:29:14 +0000 (09:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:29:21 +0000 (09:29 +0200)
commiteedea61f8a644204d4c8d5c50c4815139af76a51
tree6e6c16fbd628bb5eb577cfc70a488ca286563e58
parent2c4432bbd8c0fb9cd9fbed549457258b4746252f
parent625fe94d8104a0bc66ec8fee30b34b7d23d0edf1
Merge branch 'perf/urgent' into perf/core

Merge reason: pick up the latest fixes - they won't make v3.0.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ftrace.c
kernel/trace/trace.h
kernel/trace/trace_events.c