Merge remote-tracking branch 'uprobes/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 29 Nov 2011 02:20:15 +0000 (13:20 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 29 Nov 2011 02:20:15 +0000 (13:20 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:20:15 +0000 (13:20 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:20:15 +0000 (13:20 +1100)
diff --cc arch/Kconfig
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/include/asm/thread_info.h
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/signal.c
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 02:20:15 +0000 (13:20 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 02:20:15 +0000 (13:20 +1100)
		1	2
arch/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/signal.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	patch \|	diff1 \|	diff2 \|	blob \| history