linux-stable

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00

History

Frederic Weisbecker 8f8ffe2485 Merge commit 'tracing/core' into tracing/kprobes

Conflicts:
	kernel/trace/trace_export.c
	kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

	0dd7b74787eaf7858c6c573353a83c3e2766e674:
	tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

2009-09-11 01:09:23 +02:00

events.txt

tracing/events: Add trace_event boot option

2009-07-01 15:44:24 +02:00

ftrace.txt

tracing: Remove mentioning of legacy latency_trace file from documentation

2009-09-04 23:30:38 +02:00

function-graph-fold.vim

tracing: Add vim script to enable folding for function_graph traces

2009-08-26 00:32:04 -04:00

kmemtrace.txt

trivial: Remove the hyphen from git commands