Conflicts: arch/x86/include/asm/apic.h arch/x86/include/asm/page.h arch/x86/include/asm/processor.h arch/x86/kernel/idt.c fs/initrd.c