Alex Shi 5f87c475f8 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ... Conflicts: in fs/proc/task_mmu.c: looks like vma_get_anon_name() want have a name for anonymous vma when there is no name used in vma. commit: 586278d78b The name show is after any other names, so it maybe covered. but anyway, it just a show here.		2016-09-20 15:18:54 +08:00
..
events	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2016-09-20 15:18:54 +08:00
define_trace.h	tracing: Allow disabling compilation of specific trace systems	2015-10-20 21:55:44 -04:00
perf.h	tracing: Move non perf code out of perf.h	2015-09-23 09:31:34 -04:00
syscall.h	tracing: Rename ftrace_event_{call,class} to trace_event_{call,class}	2015-05-13 14:06:10 -04:00
trace_events.h	tracing: Move non perf code out of perf.h	2015-09-23 09:31:34 -04:00