Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Ingo Molnar [Wed, 9 Jun 2010 16:55:20 +0000 (18:55 +0200)]
1  2 
MAINTAINERS
arch/x86/include/asm/perf_event.h
arch/x86/kernel/cpu/perf_event.c
include/linux/perf_event.h
include/linux/slub_def.h
include/trace/ftrace.h
kernel/perf_event.c
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_event_perf.c
mm/slub.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/slub.c
Simple merge