Merge commit 'v2.6.34-rc1' into perf/urgent

Conflicts:
	tools/perf/util/probe-event.c

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

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel.c
Simple merge

diff --cc arch/x86/kernel/dumpstack_64.c
Simple merge

diff --cc kernel/perf_event.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc tools/perf/util/probe-event.c
Simple merge