Ingo Molnar 0b20e59cef Merge branch 'perf/urgent' into perf/core, to resolve conflict ... Conflicts: arch/x86/events/intel/pt.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2016-04-28 10:35:17 +02:00
..
core.c	perf/x86/amd: Set the size of event map array to PERF_COUNT_HW_MAX	2016-04-28 10:20:25 +02:00
ibs.c	perf/x86/amd/ibs: Fix pmu::stop() nesting	2016-03-31 09:54:08 +02:00
iommu.c	perf/x86/amd: Add support for new IOMMU performance events	2016-03-21 09:35:28 +01:00
iommu.h
power.c	perf/x86/amd/power: Add AMD accumulated power reporting mechanism	2016-03-21 09:37:15 +01:00
uncore.c	perf/x86/amd/uncore: Do not register a task ctx for uncore PMUs	2016-04-13 11:56:36 +02:00