Merge branch 'linus' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
commite1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4
tree6a6c805fdfd6a2f6433956cbee348b2c3a277784
parent944ac4259e39801c843a915c3da8194ac9af0440
parent7f82f000ed030d1108b4de47d9e2d556092980c6
Merge branch 'linus' into tracing/ftrace
include/linux/ftrace.h
kernel/sysctl.c
kernel/trace/trace.c