Merge branch 'perf/core' into perf/uprobes
authorIngo Molnar <mingo@kernel.org>
Sat, 14 Apr 2012 11:18:27 +0000 (13:18 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 14 Apr 2012 11:19:04 +0000 (13:19 +0200)
commit6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e
tree021cc9f6b477146fcebe6f3be4752abfa2ba18a9
parent682968e0c425c60f0dde37977e5beb2b12ddc4cc
parenta385ec4f11bdcf81af094c03e2444ee9b7fad2e5
Merge branch 'perf/core' into perf/uprobes

Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/Kconfig
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/signal.c
include/linux/sched.h
kernel/fork.c
kernel/signal.c
mm/mmap.c