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: 0dd7b74787: 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
..
asm	Merge commit 'tracing/core' into tracing/kprobes	2009-09-11 01:09:23 +02:00