Merge commit 'v2.6.32-rc7' into perf/core
authorIngo Molnar <mingo@elte.hu>
Sun, 15 Nov 2009 08:50:38 +0000 (09:50 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 15 Nov 2009 08:50:41 +0000 (09:50 +0100)
commit39dc78b6510323848e3356452f7dab9499736978
treecf8a8fede74e41b203fd00e3ccd21ead2e851442
parent4c49b12853fbb5eff4849b7b6a1e895776f027a1
parent156171c71a0dc4bce12b4408bb1591f8fe32dc1a
Merge commit 'v2.6.32-rc7' into perf/core

Merge reason: pick up perf fixlets

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ftrace.c
kernel/trace/ring_buffer.c
tools/perf/builtin-record.c
tools/perf/builtin-top.c