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
..
events	Merge branch 'linus' into tracing/core	2010-04-08 10:18:47 +02:00
boot.h	tracing/fastboot: include missing headers	2008-12-12 09:26:13 +01:00
define_trace.h	events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS()	2009-11-26 09:04:55 +01:00
ftrace.h	tracing: Update comments	2010-03-31 22:56:56 -04:00
syscall.h	perf: Drop the obsolete profile naming for trace events	2010-03-10 14:47:18 +01:00