Merge branch 'linus' into perf/urgent, to pick up dependent commits
authorIngo Molnar <mingo@kernel.org>
Wed, 29 Nov 2017 06:11:24 +0000 (07:11 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 29 Nov 2017 06:11:24 +0000 (07:11 +0100)
commit4fc31ba13d052c2933bf91095c063cf9a39effd0
treebeabb73c2fe245e6541126732895da62e55bc8ee
parent0e18dd12064e07519f7cbff4149ca7fff620cbed
parentb29c6ef7bb1257853c1e31616d84f55e561cf631
Merge branch 'linus' into perf/urgent, to pick up dependent commits

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