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)
commitae7f6711d6231c9ba54feb5ba9856c3775e482f8
tree89070c82204b2503348e4fd6c51d25a169375545
parent64abebf731df87e6f4ae7d9ffc340bdf0c033e44
parentb23ff0e9330e4b11e18af984d50573598e10e7f9
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