diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-29 17:34:22 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-29 17:34:22 -0700 |
| commit | b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9 (patch) | |
| tree | 8d4b75e005cd72f67afe31b433c16528f8ce897f /core/include | |
| parent | 4121b9c7962e230f8819645ecb9d5f4eac684ed2 (diff) | |
| parent | 68a7538d5a80ec8db48c02d4a9de7199df0af9f9 (diff) | |
| download | syslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.tar.gz | |
Merge branch 'master' into pathbased
Resolved Conflicts:
MCONFIG.embedded
com32/MCONFIG
com32/include/com32.h
core/com32.inc
core/pxelinux.asm
doc/comboot.txt
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'core/include')
0 files changed, 0 insertions, 0 deletions