Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Ingo Molnar [Sat, 27 Feb 2010 09:06:10 +0000 (10:06 +0100)]
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge