Merge branch 'pxechn-fix-news-for-hpa-2' of git://github.com/geneC/syslinux

Conflicts:
	NEWS
	com32/modules/Makefile

diff --cc NEWS
index f19e0d5,9dadd7e..20a2279
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -4,21 -4,9 +4,23 @@@ to all derivatives
  
  Changes in 4.06:
        * Support for NTFS, by Paulo Alcantara.
-       * pxechn.c32: New PXE NBP chainloader.
 +      * EXTLINUX: more robust device detection, allow user to override.
 +      * kontron_wdt.c32: Adding a new module to enable the hardware 
 +        watchdog of some Kontron boards. It allow enabling the watchdog
 +        and then booting a given image.
 +      * HDT updated, and now can display images regarding some detection
 +        steps. Adding postexec command to run a particular entry after
 +        HDT's execution, adding silent option and various fixes.
 +      * ifcpu.c32: Detect hypervisor presence.
 +      * lua.c32: Add dhcp support and support for native Syslinux
 +        functions syslinux_config(), syslinux_ipappend_strings() and
 +        syslinux_reboot().
 +      * isohybrid: Workaround for various EFI systems.
+       * pxechn.c32, a PXE NBP chainloader.  More versatile alternative
+         to pxechain.com and resolves the PXELINUX -> WDS issue with
+         Microsoft Windows Server 2008R2 (Gene Cumm).
 +      * btrfs: Fix booting off of a subvolume.
 +      * com32: Add device tree support.
  
  Changes in 4.05:
        * HDT updated, and now supports uploading data to a TFTP

diff --cc com32/modules/Makefile
index 24b7d28,35e297f..f110e58
--- 1/com32/modules/Makefile
--- 2/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@@ -24,7 -24,7 +24,7 @@@ MODULES         = config.c32 ethersel.c32 dmi
            meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \
            kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \
            ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 \
-           whichsys.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32
 -          whichsys.c32 prdhcp.c32 pxechn.c32
++          whichsys.c32 prdhcp.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32
  
  TESTFILES =