merge mainline into intwrap

diff --cc conf/i386-ieee1275.rmk
Simple merge

diff --cc conf/i386-pc.rmk
index 2eca82d,a5a1b08..b50655e
--- 1/conf/i386-pc.rmk
--- 2/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -53,10 -54,11 +53,10 @@@ 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 += machine/biosdisk.h machine/vga.h machine/vbe.h \
 -      machine/pxe.h i386/pit.h
 +kernel_img_HEADERS += machine/pxe.h i386/pit.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)
+ kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
  kernel_img_FORMAT = binary
  
  # Utilities.

diff --cc include/grub/misc.h
Simple merge

diff --cc kern/i386/coreboot/init.c
Simple merge