Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Mon, 5 Mar 2012 08:20:08 +0000 (09:20 +0100)]
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/perf.h
tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

16 files changed:
1  2 
arch/powerpc/kernel/perf_event.c
arch/x86/include/asm/perf_event.h
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event.h
fs/exec.c
include/trace/events/sched.h
kernel/events/core.c
kernel/events/hw_breakpoint.c
kernel/irq/chip.c
kernel/sched/core.c
kernel/sched/fair.c
net/core/dev.c
net/core/sock.c
tools/perf/util/evlist.c
tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge
Simple merge
Simple merge