Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
commit6fb83029db161141d68cf019760a893d03d0682b
authorIngo Molnar <mingo@elte.hu>
Sat, 27 Feb 2010 09:06:10 +0000 (27 10:06 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 27 Feb 2010 09:06:10 +0000 (27 10:06 +0100)
tree6f149c23cedc9b2a5f72b5b90ab8426b39afbb7c
parent281b3714e91162b66add1cfac404cf7b81e3e2f2
parente01292b1fd68ff2abe234d584b06e64344d2c1de
Merge branch 'tracing/core' of git://git./linux/kernel/git/frederic/random-tracing into tracing/core
Documentation/trace/ftrace-design.txt
arch/s390/kernel/ptrace.c
arch/x86/Kconfig
arch/x86/kernel/ftrace.c
kernel/trace/Kconfig
kernel/trace/trace_syscalls.c