Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux...
authorH. Peter Anvin <hpa@zytor.com>
Wed, 7 Feb 2007 22:13:09 +0000 (14:13 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 7 Feb 2007 22:13:09 +0000 (14:13 -0800)
1  2 
unix/syslinux.c

diff --cc unix/syslinux.c
Simple merge