Ingo Molnar 629b3df7ec 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>

2020-03-25 15:20:44 +01:00

..

core.c

perf/x86/amd: Add missing L2 misses event spec to AMD Family 17h's event map

2020-02-11 13:17:51 +01:00

ibs.c

perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h)

2019-10-28 11:02:00 +01:00

iommu.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500

2019-06-19 17:09:55 +02:00

iommu.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500

2019-06-19 17:09:55 +02:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

power.c

x86/perf/events: Convert to new CPU match macros

2020-03-24 21:22:28 +01:00

uncore.c

Merge branch 'perf/urgent' into perf/core, to pick up fixes

2020-03-19 15:01:45 +01:00