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

author Ingo Molnar <mingo@elte.hu>

Tue, 10 May 2011 15:05:24 +0000 (17:05 +0200)

committer Ingo Molnar <mingo@elte.hu>

Tue, 10 May 2011 15:05:45 +0000 (17:05 +0200)
author Ingo Molnar <mingo@elte.hu>
Tue, 10 May 2011 15:05:24 +0000 (17:05 +0200)
committer Ingo Molnar <mingo@elte.hu>
Tue, 10 May 2011 15:05:45 +0000 (17:05 +0200)
diff --cc arch/x86/kernel/cpu/perf_event_intel.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
diff --cc tools/perf/Makefile
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 10 May 2011 15:05:24 +0000 (17:05 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 10 May 2011 15:05:45 +0000 (17:05 +0200)
		1	2
arch/x86/kernel/cpu/perf_event_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history