Merge branch 'master' into pathbased

Resolved Conflicts:
	com32/modules/Makefile
	core/comboot.inc
	core/cpuinit.inc
	core/idle.inc

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --cc com32/modules/Makefile
index b7d6212,44bc1df..40df0c8
--- 1/com32/modules/Makefile
--- 2/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@@ -21,8 -21,8 +21,8 @@@ include ../MCONFI
  MODULES         = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \
            disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \
            meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \
 -          kbdmap.c32 cmd.c32 vpdtest.c32 gpxecmd.c32 ifcpu.c32 \
 -          cpuid.c32
 +          kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 dir.c32 gpxecmd.c32 \
-           ifcpu.c32
++          ifcpu.c32 cpuid.c32
  
  TESTFILES =
  

diff --cc core/conio.inc
Simple merge

diff --cc core/diskstart.inc
index 610c9fd,b8ab790..c24b64a
--- 1/core/diskstart.inc
--- 2/core/diskstart.inc
+++ b/core/diskstart.inc
@@@ -471,12 -465,10 +471,11 @@@ bootsignature   dw kaboom.again-bootse
  ;  Start of LDLINUX.SYS
  ; ===========================================================================
  
 +LDLINUX_SYS   equ ($-$$)+TEXT_START
  ldlinux_sys:
  
- syslinux_banner       db 0Dh, 0Ah
-               db MY_NAME, ' ', VERSION_STR, ' ', DATE_STR, ' ', 0
-               db 0Dh, 0Ah, 1Ah        ; EOF if we "type" this in DOS
+ syslinux_banner       db CR, LF, MY_NAME, ' ', VERSION_STR, ' ', DATE_STR, ' ', 0
+               db CR, LF, 1Ah  ; EOF if we "type" this in DOS
  
                alignz 8
  ldlinux_magic dd LDLINUX_MAGIC

diff --cc core/pxelinux.asm
Simple merge

diff --cc core/ui.inc
index d60d5ca,ed96ccd..00d2cfd
--- 1/core/ui.inc
--- 2/core/ui.inc
+++ b/core/ui.inc
@@@ -542,11 -541,12 +542,12 @@@ getchar_timeout
                call reset_idle
  
  .loop:
 -              push word [BIOS_timer]
 +              push word [__jiffies]
                call pollchar
                jnz .got_char
+               call do_idle
                pop ax
 -              cmp ax,[BIOS_timer]             ; Has the timer advanced?
 +              cmp ax,[__jiffies]              ; Has the timer advanced?
                je .loop
  
                dec dword [ThisKbdTo]

diff --cc doc/comboot.txt
Simple merge