aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-14 13:57:50 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-14 13:57:50 -0800
commit3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea (patch)
tree468f0e19dfbbf773ddd980211b042f4402919c03 /doc
parent5e50b4d4faf398f072c0dea814b11db1a95efeec (diff)
parentb82686b524d2ee4441ce411fa6db3a210edbaa34 (diff)
downloadsyslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.gz
syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.xz
syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.zip
Merge branch 'master' into pathbased
Resolved Conflicts: com32/Makefile com32/include/syslinux/pxe.h core/pxelinux.asm core/syslinux.ld Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/comboot.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/comboot.txt b/doc/comboot.txt
index fb954038..6d026aab 100644
--- a/doc/comboot.txt
+++ b/doc/comboot.txt
@@ -404,6 +404,7 @@ AX=000Ah [2.00] Get Derivative-Specific Information
Input: AX 000Ah
Output: AL 32h (PXELINUX)
DX PXE API version detected (DH=major, DL=minor)
+ ECX Local IP number (network byte order) [3.85]
ES:BX pointer to PXENV+ or !PXE structure
FS:SI pointer to original stack with invocation record