Commits
![Ingo Molnar](https://secure.gravatar.com/avatar/32bf2b7caf423ebd4d5cc5c6288af416.jpg?s=96&d=mm)
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>