Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Tue, 16 Apr 2019 10:14:46 +0000 (12:14 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 16 Apr 2019 10:14:46 +0000 (12:14 +0200)
commitcc8670945d43f857dcb99c61ea3beaacfb6ed472
tree9f75c5df1c2d46e2a48c06f9939cc5548715121e
parent496156e3647f44e2aab3e64f86b63294afca458a
parent9d5dcc93a6ddfc78124f006ccd3637ce070ef2fc
Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/core.c
arch/x86/events/perf_event.h
kernel/events/core.c