Merge mainline into intwrap

diff --cc conf/i386-pc.rmk
index d05d82796bbff85b7f8125e09601c3c1a733501c,ece88446b3847e4e8013e17197b7a8c3b57f919e..84e6f1b1ee03510935f932efc20d684af0edacad
--- 1/conf/i386-pc.rmk
--- 2/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -59,13 -54,8 +54,8 @@@ kernel_img_SOURCES = kern/i386/pc/start
        kern/env.c \
        term/i386/pc/console.c term/i386/vga_common.c \
        symlist.c
- kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-       env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-       partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-       machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
-       machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
-       machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h \
-       i18n.h env_private.h machine/int.h
+ kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
 -      machine/pxe.h i386/pit.h machine/init.h
++      machine/pxe.h i386/pit.h machine/init.h machine/int.h
  kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
  kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
  kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)

diff --cc kern/i386/pc/startup.S
Simple merge