Merge branch 'x86/cleanups' into perf/uprobes
authorIngo Molnar <mingo@elte.hu>
Tue, 13 Mar 2012 15:32:54 +0000 (16:32 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 Mar 2012 15:33:03 +0000 (16:33 +0100)
commitef15eda98217f5183f457e7a2de8b79555ef908b
treef8f22b48f7bb237c9aa6646175f3e17eeac4af0e
parent5cb4ac3a583d4ee18c8682ab857e093c4a0d0895
parentef334a20d84f52407a8a2afd02ddeaecbef0ad3d
Merge branch 'x86/cleanups' into perf/uprobes

Merge reason: We want to merge a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/powerpc/kernel/perf_event.c
arch/x86/Kconfig
arch/x86/include/asm/perf_event.h
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event.h
kernel/events/core.c
kernel/events/hw_breakpoint.c
tools/perf/util/evlist.c
tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c