Merge branch 'perf/urgent' into perf/core

Merge reason: Pick up pending fixes before applying dependent new changes.

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

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

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

diff --cc kernel/perf_event.c
Simple merge

diff --cc kernel/trace/trace_event_perf.c
Simple merge

diff --cc kernel/watchdog.c
Simple merge