Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Wed, 9 Jun 2010 16:55:20 +0000 (18:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 9 Jun 2010 16:55:57 +0000 (18:55 +0200)
commitc726b61c6a5acc54c55ed7a0e7638cc4c5a100a8
tree3f44aa013d31d34951e9610e79ff14c1148ad6ac
parent7be7923633a142402266d642ccebf74f556a649b
parent018378c55b03f88ff513aba4e0e93b8d4a9cf241
Merge branch 'perf/core' of git://git./linux/kernel/git/frederic/random-tracing into perf/core
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