You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		15 years ago
..
events	Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	15 years ago
boot.h	tracing/fastboot: include missing headers	16 years ago
define_trace.h	events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS()	15 years ago
ftrace.h	tracing: Change event->profile_count to be int type	15 years ago
syscall.h	trace_syscalls: Simplify syscall profile	15 years ago