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

Pull small x86 fixes from Peter Anvin:
 "A collection of very small fixes, mostly pure documentation."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, doc: Document that bootloader ID 4 is used also by iPXE
  x86, doc: Add a formal bootloader ID for kexec-tools
  x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops

diff --combined Documentation/x86/boot.txt
index f15cb74c4f783263bba9917ec3f73755f23e09e4,9a89e01d9bced9f96d0f76e1490303b791957ec8..406d82d5d2bb1e08a8cb9e4c548ce937f448b376
--- 1/Documentation/x86/boot.txt
--- 2/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@@ -373,7 -373,7 +373,7 @@@ Protocol:  2.00
        1  Loadlin
        2  bootsect-loader      (0x20, all other values reserved)
        3  Syslinux
-       4  Etherboot/gPXE
+       4  Etherboot/gPXE/iPXE
        5  ELILO
        7  GRUB
        8  U-Boot
@@@ -381,6 -381,7 +381,7 @@@
        A  Gujin
        B  Qemu
        C  Arcturus Networks uCbootloader
+       D  kexec-tools
        E  Extended             (see ext_loader_type)
        F  Special              (0xFF = undefined)
         10  Reserved
@@@ -1013,7 -1014,7 +1014,7 @@@ boot_params as that of 16-bit boot prot
  also fill the additional fields of the struct boot_params as that
  described in zero-page.txt.
  
 -After setupping the struct boot_params, the boot loader can load the
 +After setting up the struct boot_params, the boot loader can load the
  32/64-bit kernel in the same way as that of 16-bit boot protocol.
  
  In 32-bit boot protocol, the kernel is started by jumping to the
@@@ -1023,7 -1024,7 +1024,7 @@@
  At entry, the CPU must be in 32-bit protected mode with paging
  disabled; a GDT must be loaded with the descriptors for selectors
  __BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat
 -segment; __BOOS_CS must have execute/read permission, and __BOOT_DS
 +segment; __BOOT_CS must have execute/read permission, and __BOOT_DS
  must have read/write permission; CS must be __BOOT_CS and DS, ES, SS
  must be __BOOT_DS; interrupt must be disabled; %esi must hold the base
  address of the struct boot_params; %ebp, %edi and %ebx must be zero.