Merge branch 'perf/x86' into perf/core, because it's ready
authorIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:19 +0000 (09:46 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:19 +0000 (09:46 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/arm64/kernel/hw_breakpoint.c
arch/x86/kernel/cpu/common.c
include/linux/perf_event.h
kernel/events/core.c
kernel/trace/trace_uprobe.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge