Merge branch 'perf/urgent' into perf/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Thu, 28 Apr 2016 08:35:17 +0000 (10:35 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 28 Apr 2016 08:35:17 +0000 (10:35 +0200)
commit0b20e59cef927b030c2e626f40fc4965bacec847
treec090a7a4e2c20065eb5825debff1a724a7775b8a
parenta8944c5bf86dc6c153a71f2a386738c0d3f5ff9c
parentcf3beb7c90a8efa16a06b26634cddddc92bb819c
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>
arch/x86/events/intel/lbr.c
arch/x86/events/intel/pt.c
kernel/events/core.c