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.

Steven Rostedt d244b6bd41 Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4 ... Conflicts: kernel/trace/trace_events.c Signed-off-by: Steven Rostedt <rostedt@goodmis.org>		15 years ago
..
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	15 years ago
Makefile	…
blktrace.c	block: add secure discard	15 years ago
ftrace.c	…
power-traces.c	…
ring_buffer.c	Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4	15 years ago
ring_buffer_benchmark.c	…
trace.c	Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4	15 years ago
trace.h	…
trace_branch.c	…
trace_clock.c	…
trace_entries.h	…
trace_event_perf.c	…
trace_events.c	Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4	15 years ago
trace_events_filter.c	…
trace_export.c	…
trace_functions.c	…
trace_functions_graph.c	Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4	15 years ago
trace_irqsoff.c	…
trace_kdb.c	…
trace_kprobe.c	…
trace_mmiotrace.c	…
trace_nop.c	…
trace_output.c	…
trace_output.h	…
trace_printk.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_syscalls.c	…
trace_workqueue.c	…