Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 4 Dec 2015 09:35:29 +0000 (10:35 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 6 Dec 2015 11:55:37 +0000 (12:55 +0100)
commit42a0789bf503d53ce099a73543278bd0164d8954
tree2188bab2b130a9428b09884e7f231958632cc6d9
parentac675d0d586a2d96df58228c495b4005bc7bca7b
parent4e93ad601a4308d4a67673c81556580817d56940
Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.h
arch/x86/kernel/cpu/perf_event_intel.c