Ingo Molnar cc0104e877 Merge branch 'linus' into tracing/urgent ... Conflicts: kernel/trace/trace_kprobe.c Merge reason: resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-12-14 09:16:49 +01:00
..
events	Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-11 20:49:09 -08: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: Change event->profile_count to be int type	2009-12-13 18:37:28 +01:00
syscall.h	trace_syscalls: Simplify syscall profile	2009-12-01 17:33:30 +01:00