Merge commit 'v2.6.39-rc7' into perf/core
Ingo Molnar [Tue, 10 May 2011 15:05:24 +0000 (17:05 +0200)]
Merge reason: pull in the latest fixes.

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

1  2 
arch/x86/kernel/cpu/perf_event_intel.c
kernel/trace/trace.c
tools/perf/Makefile

Simple merge
Simple merge