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)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/cpu/perf_event.h
arch/x86/kernel/cpu/perf_event_intel.c

Simple merge