Commits
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>
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>