tree 96c372824bfe05cae4b2b2b57c96719d633296da
parent d040c1614c24162adc3fe106b182596999264e26
parent 54321d947ae9d6a051b81e3eccaf2d8658aeecc6
author Ingo Molnar <mingo@elte.hu> 1234526940 +0100
committer Ingo Molnar <mingo@elte.hu> 1234526940 +0100

Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers

Conflicts:
	arch/x86/include/asm/page.h
	arch/x86/include/asm/pgtable.h
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c