linux_dsm_epyc7002/include/trace
Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core
Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

  52469b4fcd Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2013-11-01 08:24:41 +01:00
..
events Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
define_trace.h tracing: Add DEFINE_EVENT_FN() macro 2013-06-20 22:24:32 -07:00
ftrace.h tracing/perf: Avoid perf_trace_buf_*() in perf_trace_##call() when possible 2013-08-13 21:06:30 -04:00
syscall.h tracing: Add missing syscall_metadata comment 2013-07-01 20:34:25 -04:00