Merge branch 'core/xen' into x86/xen

author Ingo Molnar <mingo@elte.hu>

Wed, 10 Sep 2008 12:05:45 +0000 (14:05 +0200)

committer Ingo Molnar <mingo@elte.hu>

Wed, 10 Sep 2008 12:05:45 +0000 (14:05 +0200)
author Ingo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 12:05:45 +0000 (14:05 +0200)
committer Ingo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 12:05:45 +0000 (14:05 +0200)
diff --cc arch/x86/kernel/cpu/common.c
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 10 Sep 2008 12:05:45 +0000 (14:05 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 10 Sep 2008 12:05:45 +0000 (14:05 +0200)
		1	2
arch/x86/kernel/cpu/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history