You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ingo Molnar 44b0635481 Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace ... Conflicts: kernel/trace/trace_hw_branches.c		16 years ago
..
Kconfig	ring-buffer: add NMI protection for spinlocks	16 years ago
Makefile	…
ftrace.c	trace: trivial fixes in comment typos.	16 years ago
kmemtrace.c	…
ring_buffer.c	Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace	16 years ago
trace.c	Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace	16 years ago
trace.h	Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace	16 years ago
trace_boot.c	…
trace_branch.c	…
trace_functions.c	…
trace_functions_graph.c	…
trace_hw_branches.c	Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace	16 years ago
trace_irqsoff.c	…
trace_mmiotrace.c	…
trace_nop.c	…
trace_output.c	Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace	16 years ago
trace_output.h	…
trace_power.c	…
trace_sched_switch.c	…
trace_sched_wakeup.c	…
trace_selftest.c	…
trace_selftest_dynamic.c	…
trace_stack.c	…
trace_stat.c	…
trace_stat.h	…
trace_sysprof.c	…
trace_workqueue.c	…