Merge branch 'perf/urgent' into perf/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Sat, 23 Apr 2016 12:12:10 +0000 (14:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 23 Apr 2016 12:12:10 +0000 (14:12 +0200)
commit65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee
tree02b22c99008630010f28f45f502f55915f1014c2
parent9243ae5b28d02dc7d71a4f00c981ef6feaede3f1
parentb303e7c15d53cd8ef6b349b702e07eee3f102792
Merge branch 'perf/urgent' into perf/core, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/rapl.c
kernel/events/core.c
tools/perf/util/intel-pt.c