Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core
Ingo Molnar [Tue, 3 Feb 2009 05:25:38 +0000 (06:25 +0100)]
1  2  3 
Documentation/kernel-parameters.txt
MAINTAINERS
block/blktrace.c
include/linux/blktrace_api.h
include/linux/sched.h
include/linux/slab_def.h
kernel/relay.c
kernel/sched.c
kernel/workqueue.c
mm/slub.c
scripts/Makefile.build

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/relay.c
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
diff --cc mm/slub.c
Simple merge
Simple merge