]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb620e2e68b87cabfb090a34e69f45bd489eb3e66
tree02b22c99008630010f28f45f502f55915f1014c2
parent7580f0f90038220f8c555c90749a6e18ed0703a5
parent31d02883ef7a44cdc14b013f0248ed1c96ed5e7e
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