Merge branch 'x86/generalize-visws' into x86/core

author Ingo Molnar <mingo@elte.hu>

Fri, 11 Jul 2008 19:22:18 +0000 (21:22 +0200)

committer Ingo Molnar <mingo@elte.hu>

Fri, 11 Jul 2008 19:22:18 +0000 (21:22 +0200)
author Ingo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 19:22:18 +0000 (21:22 +0200)
committer Ingo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 19:22:18 +0000 (21:22 +0200)
diff --cc arch/x86/kernel/Makefile
Simple merge
diff --cc arch/x86/kernel/e820.c
Simple merge
diff --cc arch/x86/kernel/setup.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 11 Jul 2008 19:22:18 +0000 (21:22 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 11 Jul 2008 19:22:18 +0000 (21:22 +0200)
		1	2
arch/x86/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/e820.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history