Ingo Molnar f407a82586 Merge branch 'linus' into sched/core, to resolve conflict ... Conflicts: arch/sparc/include/asm/topology_64.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2015-06-02 08:05:42 +02:00
..
events	Merge branch 'linus' into sched/core, to resolve conflict	2015-06-02 08:05:42 +02:00
define_trace.h
ftrace.h	tracing: Add TRACE_DEFINE_ENUM() macro to map enums to their values	2015-04-08 09:39:56 -04:00
syscall.h	tracing: Fix syscall_*regfunc() vs copy_process() race	2014-06-21 00:15:12 -04:00