Merge remote-tracking branch 'tip/perf/urgent' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
To pick up fixes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
kernel/events/core.c
kernel/trace/trace_kprobe.c

Simple merge
Simple merge