Ingo Molnar f066a15533 Merge branch 'x86/urgent' into x86/xen ... Conflicts: arch/frv/include/asm/pgtable.h arch/x86/include/asm/required-features.h arch/x86/xen/mmu.c Merge reason: x86/xen was on a .29 base still, move it to a fresher branch and pick up Xen fixes as well, plus resolve conflicts Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-05-08 10:50:00 +02:00
..
asm	Merge branch 'x86/urgent' into x86/xen	2009-05-08 10:50:00 +02:00