]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 29 Jan 2010 08:24:57 +0000 (09:24 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 29 Jan 2010 09:36:22 +0000 (10:36 +0100)
commitc5e8931dc4ea7c43ad2d689458f82481f6c3e964
tree89070c82204b2503348e4fd6c51d25a169375545
parent6c16281418aba8f493df4a654d9e8d41c55fb1db
parent4a86af54584fd056cad1f46288f8cec0cca67148
Merge branch 'perf/urgent' into perf/core

Merge reason: We want to queue up a dependent patch. Also update to
              later -rc's.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/perf_event.h
arch/x86/kernel/cpu/perf_event.c
include/linux/perf_event.h
kernel/perf_event.c
kernel/sched.c
kernel/trace/trace_events_filter.c
tools/perf/builtin-kmem.c
tools/perf/builtin-report.c
tools/perf/builtin-timechart.c