Merge branch 'linus' into x86/urgent

author Ingo Molnar <mingo@elte.hu>

Mon, 20 Apr 2009 16:08:07 +0000 (18:08 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 20 Apr 2009 16:08:12 +0000 (18:08 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 20 Apr 2009 16:08:07 +0000 (18:08 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 20 Apr 2009 16:08:12 +0000 (18:08 +0200)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 20 Apr 2009 16:08:07 +0000 (18:08 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 20 Apr 2009 16:08:12 +0000 (18:08 +0200)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_uv_x.c	patch \|	diff1 \|	diff2 \|	blob \| history