Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 3 Feb 2009 05:25:38 +0000 (06:25 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 3 Feb 2009 05:25:38 +0000 (06:25 +0100)
commitdc573f9b20c8710105ac35c08ed0fe1da5160ecd
tree24db0a0f6364b78f9c74e62541d26155e785b8f9
parentb3a8c34886d0e3dd3a24a5b614ee025181da2f41
parentecf441b593ac41cb8cd8cd3695110167c42e098c
parentb1792e367053968f2ddb48bc911d314143ce6242
Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core
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