Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: fix comment in the "glove box" code
  x86, setup: "glove box" BIOS interrupts in the video code
  x86, setup: "glove box" BIOS interrupts in the MCA code
  x86, setup: "glove box" BIOS interrupts in the EDD code
  x86, setup: "glove box" BIOS interrupts in the APM code
  x86, setup: "glove box" BIOS interrupts in the core boot code
  x86, setup: "glove box" BIOS calls -- infrastructure

diff --cc arch/x86/boot/Makefile
Simple merge

diff --cc arch/x86/boot/header.S
index 1040f6e8010cd8b6ead2a20d0ec2171b16a5d13c,486d97fa7f4d32066aed306fa0b49ac42481f03a..b31cc54b46410f89b4120702b1d1b018a79e204d
--- 1/arch/x86/boot/header.S
--- 2/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@@ -224,20 -219,9 +224,20 @@@ setup_data:              .quad 0                 # 64-bit physica
                                                # single linked list of
                                                # struct setup_data
  
 +pref_address:         .quad LOAD_PHYSICAL_ADDR        # preferred load addr
 +
 +#define ZO_INIT_SIZE  (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
 +#define VO_INIT_SIZE  (VO__end - VO__text)
 +#if ZO_INIT_SIZE > VO_INIT_SIZE
 +#define INIT_SIZE ZO_INIT_SIZE
 +#else
 +#define INIT_SIZE VO_INIT_SIZE
 +#endif
 +init_size:            .long INIT_SIZE         # kernel initialization size
 +
  # End of setup header #####################################################
  
-       .section ".inittext", "ax"
+       .section ".entrytext", "ax"
  start_of_setup:
  #ifdef SAFE_RESET_DISK_CONTROLLER
  # Reset the disk controller.