summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_output.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-05 14:33:31 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-05 14:33:31 +0100
commit43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch)
tree8a7f36985f9ef8e6771163c751eeefd22ee71693 /kernel/trace/trace_output.c
parenttrace: make the trace_event callbacks return enum print_line_t (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/coo... (diff)
downloadlinux-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.tar.xz
linux-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.zip
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'kernel/trace/trace_output.c')
0 files changed, 0 insertions, 0 deletions