Merge commit 'syslinux-3.63-pre2' into nolen syslinux-3.70-pre5
authorH. Peter Anvin <hpa@zytor.com>
Fri, 21 Mar 2008 01:01:31 +0000 (18:01 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 21 Mar 2008 01:01:31 +0000 (18:01 -0700)
1  2 
pxelinux.asm

diff --cc pxelinux.asm
Simple merge