]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdfef3e0b15d1fee767295ace1e18286e012f3eb7
treec090a7a4e2c20065eb5825debff1a724a7775b8a
parent8b87c1e16d9d1fb6cfe90a790109c5d6834f2a27
parent3c2f093a9e24ad57206c2a078bd65383a2eae863
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