Merge branch 'perf/uprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/acme...
authorIngo Molnar <mingo@kernel.org>
Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
commit9cba26e66d09bf394ae5a739627a1dc8b7cae6f4
treef03743d576a0c7826b9921ad47e70370ebe80a22
parentec83db0f78cd44c3b586ec1c3a348d1a8a389797
parent73eff9f56e15598c8399c0b86899fd889b97f085
Merge branch 'perf/uprobes' of git://git./linux/kernel/git/acme/linux into perf/uprobes
arch/x86/Kconfig
kernel/trace/trace.h
mm/mmap.c