Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 12 Mar 2010 09:20:57 +0000 (10:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Mar 2010 09:20:59 +0000 (10:20 +0100)
commit937779db13fb6cb621e28d9ae0a6cf1d05b57d05
tree6c27402677c347c4dc01980de78c270630588847
parent6230f2c7ef01a69e2ba9370326572c287209d32a
parent9f591fd76afdc0e5192e9ed00a36f8efc0b4dfe6
Merge branch 'perf/urgent' into perf/core

Merge reason: We want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perf_event.c
include/linux/perf_event.h
kernel/perf_event.c
tools/perf/builtin-record.c
tools/perf/builtin-top.c