Ingo Molnar bb3c3e8071 Merge commit 'v2.6.32-rc5' into perf/probes ... Conflicts: kernel/trace/trace_event_profile.c Merge reason: update to -rc5 and resolve conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-10-17 09:58:25 +02:00
..
perf	Merge commit 'v2.6.32-rc5' into perf/probes	2009-10-17 09:58:25 +02:00