| commit | 046f19cbffec3516d4f934863820fc242f33da3c | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Wed, 26 Feb 2014 22:20:56 +0000 (26 14:20 -0800) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Wed, 26 Feb 2014 22:20:56 +0000 (26 14:20 -0800) | ||
| tree | 620c5059639e966b09501dafc7a6d263ef11ff09 | treesnapshot (tar.gz zip) |
| parent | fcfcd100c71e2f384d9c253e725c4f602c047b15 | commitdiff |
| parent | 60797dd4984cde06c0545bf804af4482b09cd977 | commitdiff |
Merge branch 'syslinux-5.xx'
Resolved Conflicts:
core/init.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
core/init.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| core/bios.c | diff1 | blobhistory |