Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
Ingo Molnar [Wed, 15 Sep 2010 08:27:31 +0000 (10:27 +0200)]
1  2 
arch/alpha/kernel/perf_event.c
arch/arm/kernel/perf_event.c
kernel/sched.c
kernel/trace/ftrace.c
kernel/trace/ring_buffer.c
net/core/dev.c
net/core/skbuff.c
tools/perf/util/symbol.c
tools/perf/util/symbol.h

Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge