]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 10:19:57 +0000 (12:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 10:20:01 +0000 (12:20 +0200)
commit45bceffc3013bda7d2ebc7802e9b153b674e2d44
tree222d7dd8fd300925cbf12cdc0fba5bee2528997e
parent6f2f3cf00ee32f75ba007a46bab88a54d68a5deb
parent78af08d90b8f745044b1274430bc4bc6b2b27aca
Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on an older, pre-rc1 base.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_functions.c