Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 09:18:43 +0000 (10:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 09:18:43 +0000 (10:18 +0100)
commit99793e3dbe39a50d871eedc361659a894601e2bf
treea676d42a42f4c884e38121e5a5a4d6630929a9f7
parent3e80680208ba6ce9635ca7c21ad0019442ea166a
parenta103e2ab7377dbbef2506be59c49a3f2ae10b60b
Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
kernel/trace/Makefile
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_boot.c
kernel/trace/trace_functions_graph.c
kernel/trace/trace_hw_branches.c
kernel/trace/trace_power.c