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)
Merge reason: We want to apply a dependent patch.

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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge