]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdbf172d33826860821189cf0b44a8e2195f6b58d
treec2f70525dc152e0ddce60f1a3021473cc6a3f298
parentfef2ea3386d9de537f7c1258c4880e54e7ad6ee5
parent4dd775d57b864270dfc9efea32fbe61195786fe6
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