Merge commit 'v2.6.32-rc7' into perf/core

Merge reason: pick up perf fixlets

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

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc tools/perf/builtin-record.c
Simple merge

diff --cc tools/perf/builtin-top.c
Simple merge