Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Thu, 9 Sep 2010 18:40:06 +0000 (20:40 +0200)]
Merge reason: Pick up pending fixes before applying dependent new changes.

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

1  2 
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_p4.c
kernel/perf_event.c
kernel/trace/trace_event_perf.c
kernel/watchdog.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge