Merge branch 'linus' into tracing/ftrace
Ingo Molnar [Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)]
1  2 
include/linux/ftrace.h
kernel/sysctl.c
kernel/trace/trace.c

Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge