diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2020-03-25 15:20:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2020-03-25 15:20:44 +0100 |
| commit | 629b3df7ecb01fddfdf71cb5d3c563d143117c33 (patch) | |
| tree | a2e5ad1266c9660c934b9bf7a1621f6a3a48e28b /drivers/acpi/dptf | |
| parent | perf/x86/intel/uncore: Factor out __snr_uncore_mmio_init_box (diff) | |
| parent | cpufreq/intel_pstate: Fix wrong macro conversion (diff) | |
| download | linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.tar.gz linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.tar.bz2 linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.zip | |
Merge branch 'x86/cpu' into perf/core, to resolve conflict
Conflicts:
arch/x86/events/intel/uncore.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/dptf')
0 files changed, 0 insertions, 0 deletions