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	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	15 years ago
blktrace.c	block: add secure discard	15 years ago
ftrace.c	tracing: Remove ftrace_preempt_disable/enable	15 years ago
power-traces.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
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	ring-buffer: Make benchmark handle missed events	15 years ago
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	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	15 years ago
trace_branch.c	tracing: Allow events to share their print functions	15 years ago
trace_clock.c	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	15 years ago
trace_entries.h	tracing: Remove special traces	15 years ago
trace_event_perf.c	perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call	15 years ago
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	tracing: Remove test of NULL define_fields callback	15 years ago
trace_export.c	tracing: Remove redundant raw_init callbacks	15 years ago
trace_functions.c	tracing: Remove ftrace_preempt_disable/enable	15 years ago
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	tracing: Shrink max latency ringbuffer if unnecessary	15 years ago
trace_kdb.c	ftrace,kdb: Allow dumping a specific cpu's buffer with ftdump	15 years ago
trace_kprobe.c	tracing/kprobes: unregister_trace_probe needs to be called under mutex	15 years ago
trace_mmiotrace.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
trace_nop.c	tracing/ftrace: make nop-tracer use polling wait for events on pipe	16 years ago
trace_output.c	Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core	15 years ago
trace_output.h	tracing: Allow events to share their print functions	15 years ago
trace_printk.c	tracing: Remove markers	16 years ago
trace_sched_switch.c	tracing: Let tracepoints have data passed to tracepoint callbacks	15 years ago
trace_sched_wakeup.c	tracing: Shrink max latency ringbuffer if unnecessary	15 years ago
trace_selftest.c	tracing: Remove special traces	15 years ago
trace_selftest_dynamic.c	…
trace_stack.c	tracing: Remove ftrace_preempt_disable/enable	15 years ago
trace_stat.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
trace_stat.h	tracing/stat: Add stat_release() callback	16 years ago
trace_syscalls.c	tracing: Use a global field list for all syscall exit events	15 years ago
trace_workqueue.c	tracing: Let tracepoints have data passed to tracepoint callbacks	15 years ago