Merge branch 'perf/uprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/acme...

author Ingo Molnar <mingo@kernel.org>

Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)

committer Ingo Molnar <mingo@kernel.org>

Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
author Ingo Molnar <mingo@kernel.org>
Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
committer Ingo Molnar <mingo@kernel.org>
Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
diff --cc mm/mmap.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 14 May 2012 12:43:40 +0000 (14:43 +0200)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	patch \|	diff1 \|	diff2 \|	blob \| history