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)
commit936c663aed930972f7e185485fd6c2da69e33819
tree41bb069f66e109fc63c4114a4390de44d3068356
parent072e5a1cfabca7276744d24726e094d85721df5c
parent50f16a8bf9d7a92c437ed1867d0f7e1dc6a9aca9
Merge branch 'perf/x86' into perf/core, because it's ready

Signed-off-by: Ingo Molnar <mingo@kernel.org>
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