Merge branch 'perf/uprobes'

author Ingo Molnar <mingo@kernel.org>

Sat, 31 Mar 2012 09:50:15 +0000 (11:50 +0200)

committer Ingo Molnar <mingo@kernel.org>

Sat, 31 Mar 2012 09:50:15 +0000 (11:50 +0200)
author Ingo Molnar <mingo@kernel.org>
Sat, 31 Mar 2012 09:50:15 +0000 (11:50 +0200)
committer Ingo Molnar <mingo@kernel.org>
Sat, 31 Mar 2012 09:50:15 +0000 (11:50 +0200)
diff --cc kernel/fork.c
Simple merge
diff --cc mm/mmap.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Sat, 31 Mar 2012 09:50:15 +0000 (11:50 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 31 Mar 2012 09:50:15 +0000 (11:50 +0200)
		1	2
kernel/fork.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	patch \|	diff1 \|	diff2 \|	blob \| history