Merge branch 'x86/cache' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Tue, 23 Oct 2018 10:30:19 +0000 (12:30 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 23 Oct 2018 10:30:19 +0000 (12:30 +0200)
commitdda93b45389f025fd3422d22cc31cc1ea6040305
tree44a856744843e24ed1baf6ca4edb1be04809a606
parent2e62024c265aa69315ed02835623740030435380
parentb61b8bba18fe2b63d38fdaf9b83de25e2d787dfe
Merge branch 'x86/cache' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c
arch/x86/kernel/tsc.c