diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-11-05 17:52:47 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-11-06 15:57:15 -0800 |
| commit | 8492da661cc77e26cd18e4cf307b78e50661ea29 (patch) | |
| tree | d3d19f6c48eef6e6b44982f3d8b2fa993edfe16c /com32/include/syslinux | |
| parent | ebef1cd107b7034056309bf49f92a2b9e92b9fe0 (diff) | |
| parent | 259c0dca1bc6ead6003fc504e136be67a1311abb (diff) | |
| download | syslinux-8492da661cc77e26cd18e4cf307b78e50661ea29.tar.gz | |
Merge branch 'master' into fsc
Conflicts:
com32/modules/Makefile
core/pxelinux.asm
core/serirq.inc
Note: hardwired options will need to be re-implemented in PXELINUX.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/include/syslinux')
0 files changed, 0 insertions, 0 deletions