Merge commit 'v2.6.28-rc2' into x86/uv

author Ingo Molnar <mingo@elte.hu>

Mon, 27 Oct 2008 11:38:02 +0000 (12:38 +0100)

committer Ingo Molnar <mingo@elte.hu>

Mon, 27 Oct 2008 11:38:02 +0000 (12:38 +0100)
author Ingo Molnar <mingo@elte.hu>
Mon, 27 Oct 2008 11:38:02 +0000 (12:38 +0100)
committer Ingo Molnar <mingo@elte.hu>
Mon, 27 Oct 2008 11:38:02 +0000 (12:38 +0100)
diff --cc arch/x86/include/asm/uv/bios.h
Simple merge
diff --cc arch/x86/kernel/genx2apic_uv_x.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 27 Oct 2008 11:38:02 +0000 (12:38 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 27 Oct 2008 11:38:02 +0000 (12:38 +0100)
		1	2
arch/x86/include/asm/uv/bios.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_uv_x.c	patch \|	diff1 \|	diff2 \|	blob \| history