Merge branch 'x86/urgent' into x86/xen
Ingo Molnar [Fri, 8 May 2009 08:50:00 +0000 (10:50 +0200)]
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>

1  2 
arch/x86/include/asm/paravirt.h
arch/x86/lguest/boot.c
arch/x86/mm/pageattr.c
arch/x86/xen/mmu.c
kernel/sched.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge