Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing...
commit1c511f740fe7031867f51831854360e8be1ba34c
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 09:25:18 +0000 (13 10:25 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 09:25:18 +0000 (13 10:25 +0100)
treebd678fbc8117f751a3d1f8dc93b91c215ceaf66f
parente7669b8e329255bbcb40af65b38e342825d97a46
parent00f62f614bb713027b9296068d1879fbca511eb7
parentb22f4858126a6aa852ad745b94f6b25dbdea708e
parent071a0bc2ceace31266836801510879407a3701fa
Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing/urgent' and 'linus' into tracing/core
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/process.c
include/linux/sched.h
kernel/sched.c
kernel/trace/ring_buffer.c
kernel/trace/trace_sysprof.c
mm/slab.c
mm/slob.c
mm/slub.c