Ingo Molnar
c1ab9cab75
Merge branch 'linus' into tracing/core
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
possibly racy module refcounting")
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
2010-04-08 10:18:47 +02:00 |
| .. |
|
blktrace.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
ftrace.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
Kconfig
|
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
|
2010-02-27 10:06:10 +01:00 |
|
kmemtrace.c
|
|
|
|
Makefile
|
perf: Drop the obsolete profile naming for trace events
|
2010-03-10 14:47:18 +01:00 |
|
power-traces.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
ring_buffer.c
|
Merge branch 'linus' into tracing/core
|
2010-04-08 10:18:47 +02:00 |
|
ring_buffer_benchmark.c
|
ring-buffer: Add place holder recording of dropped events
|
2010-03-31 22:57:04 -04:00 |
|
trace.c
|
Merge branch 'linus' into tracing/core
|
2010-04-08 10:18:47 +02:00 |
|
trace.h
|
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
|
2010-03-13 14:40:50 -08:00 |
|
trace_boot.c
|
|
|
|
trace_branch.c
|
tracing: Add correct/incorrect to sort keys for branch annotation output
|
2010-02-09 21:35:05 -05:00 |
|
trace_clock.c
|
tracing: Fix lockdep warning in global_clock()
|
2010-03-29 15:16:44 -04:00 |
|
trace_entries.h
|
|
|
|
trace_event_perf.c
|
perf: Correctly align perf event tracing buffer
|
2010-04-01 08:26:30 +02:00 |
|
trace_events.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
trace_events_filter.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
trace_export.c
|
tracing: Remove show_format and related macros from TRACE_EVENT
|
2010-01-06 12:08:46 -05:00 |
|
trace_functions.c
|
|
|
|
trace_functions_graph.c
|
Merge branch 'linus' into tracing/core
|
2010-04-08 10:18:47 +02:00 |
|
trace_hw_branches.c
|
|
|
|
trace_irqsoff.c
|
|
|
|
trace_kprobe.c
|
perf: Drop the obsolete profile naming for trace events
|
2010-03-10 14:47:18 +01:00 |
|
trace_ksym.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
trace_mmiotrace.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
trace_nop.c
|
|
|
|
trace_output.c
|
|
|
|
trace_output.h
|
|
|
|
trace_printk.c
|
|
|
|
trace_sched_switch.c
|
|
|
|
trace_sched_wakeup.c
|
|
|
|
trace_selftest.c
|
Merge branch 'linus' into tracing/core
|
2010-04-08 10:18:47 +02:00 |
|
trace_selftest_dynamic.c
|
|
|
|
trace_stack.c
|
tracing: Fix circular dead lock in stack trace
|
2010-02-02 10:20:18 -05:00 |
|
trace_stat.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
trace_stat.h
|
|
|
|
trace_syscalls.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |
|
trace_sysprof.c
|
perf events, x86/stacktrace: Make stack walking optional
|
2009-12-17 09:56:19 +01:00 |
|
trace_workqueue.c
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
|
2010-03-30 22:02:32 +09:00 |