Merge commit 'v2.6.32-rc7' into perf/core
Ingo Molnar [Sun, 15 Nov 2009 08:50:38 +0000 (09:50 +0100)]
Merge reason: pick up perf fixlets

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
kernel/trace/ftrace.c
kernel/trace/ring_buffer.c
tools/perf/builtin-record.c
tools/perf/builtin-top.c

Simple merge
Simple merge
Simple merge
Simple merge