diff options
| author | Gene Cumm <gene.cumm@gmail.com> | 2011-03-16 20:01:36 -0400 |
|---|---|---|
| committer | Gene Cumm <gene.cumm@gmail.com> | 2011-03-16 20:01:36 -0400 |
| commit | 92dd6530682617f9b02e7564548c637f5e9e049e (patch) | |
| tree | 4f18dd0b4d8242fcdd04ed15eb73da85a9978932 /lzo | |
| parent | a472e4b4f1bd14781c5ae012eedf9f189668945e (diff) | |
| parent | 372dfd113cb87e4b3f983db620ca5a55ab821036 (diff) | |
| download | syslinux-92dd6530682617f9b02e7564548c637f5e9e049e.tar.gz | |
Merge branch 'master' into diag-mbr-handoff-for-hpa
Conflicts:
diag/mbr/handoff.S
diag/mbr/handoff.S: Remove the attempt to zero pad/prevent overflow
Diffstat (limited to 'lzo')
0 files changed, 0 insertions, 0 deletions