Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen...

author Ingo Molnar <[email protected]>

Wed, 23 Sep 2009 12:35:10 +0000 (14:35 +0200)

committer Ingo Molnar <[email protected]>

Wed, 23 Sep 2009 12:35:10 +0000 (14:35 +0200)
author Ingo Molnar <[email protected]>
Wed, 23 Sep 2009 12:35:10 +0000 (14:35 +0200)
committer Ingo Molnar <[email protected]>
Wed, 23 Sep 2009 12:35:10 +0000 (14:35 +0200)
diff --cc arch/x86/include/asm/pgtable_types.h
Simple merge
diff --cc arch/x86/xen/enlighten.c
Simple merge
author	Ingo Molnar <[email protected]>
	Wed, 23 Sep 2009 12:35:10 +0000 (14:35 +0200)
committer	Ingo Molnar <[email protected]>
	Wed, 23 Sep 2009 12:35:10 +0000 (14:35 +0200)
		1	2
arch/x86/include/asm/pgtable_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	patch \|	diff1 \|	diff2 \|	blob \| history