Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 9 Sep 2010 18:40:06 +0000 (20:40 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 9 Sep 2010 18:40:08 +0000 (20:40 +0200)
commit2aa61274efb9f532deaebc9812675a27af1994cb
treec2f70525dc152e0ddce60f1a3021473cc6a3f298
parent359d5106a2ff4ffa2ba129ec8f54743c341dabfc
parent5e11637e2c929e34dcc0fbbfb48bdb638937701a
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>
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