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)
commit492f73a303b488ffd67097b2351d54aa6e6c7c73
tree6e6c16fbd628bb5eb577cfc70a488ca286563e58
parente08fbb78f03fe2c4f88824faf6f51ce6af185e11
parentf7bc8b61f65726ff98f52e286b28e294499d7a08
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