projects / platform / upstream / syslinux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88f16f1 3fc4c91)
Merge branch 'master' into fsc
authorH. Peter Anvin <hpa@zytor.com>
Fri, 5 Feb 2010 06:02:09 +0000 (22:02 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 5 Feb 2010 06:02:09 +0000 (22:02 -0800)
commite7b7832a4856ff509487650a61151e4fabad9f70
tree2173b6ceacdc5752cf8c4880c85042427c0bffdetree | snapshot
parent88f16f147237ab25ffd83ba67a8ccfc963fa009dcommit | diff
parent3fc4c91dff9396a901d6c5056bf9828d0943aaf8commit | diff
Merge branch 'master' into fsc

Resolved Conflicts:
core/pxelinux.asm

Note: this PXELINUX currently seems to hang with interrupts on trying
to fetch the configuration file -- further debugging will be required.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
core/fs/pxe/pxe.c diff1 | | blob | history
core/pxelinux.asm diff1 | diff2 | blob | history
Domain: System / Base;