Merge branch 'linus' into x86/tracehook

author Ingo Molnar <mingo@elte.hu>

Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)

committer Ingo Molnar <mingo@elte.hu>

Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)
author Ingo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)
committer Ingo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/signal_64.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal_64.c	patch \|	diff1 \|	diff2 \|	blob \| history