Merge commit 'v2.6.34-rc1' into perf/urgent
Ingo Molnar [Tue, 9 Mar 2010 16:11:53 +0000 (17:11 +0100)]
Conflicts:
tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

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

1  2 
MAINTAINERS
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_intel.c
arch/x86/kernel/dumpstack_64.c
kernel/perf_event.c
lib/Kconfig.debug
tools/perf/util/probe-event.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge