Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 16 Dec 2010 10:22:25 +0000 (11:22 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Dec 2010 10:22:27 +0000 (11:22 +0100)
commit006b20fe4c69189b0d854e5eabf269e50ca86cdd
tree948b08825a36114c85ddc2bfcd965c261e32810f
parent5f29805a4f4627e766f862ff9f10c14f5f314359
parentd949750fed168b6553ca11ed19e4affd19d7a4d7
Merge branch 'perf/urgent' into perf/core

Merge reason: We want to apply a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/perf_event.h
kernel/perf_event.c
tools/perf/builtin-record.c
tools/perf/util/header.c
tools/perf/util/symbol.c