diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-17 14:21:44 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-17 14:21:44 -0800 |
| commit | 37c0cfcc30b5b713e30b5bc741d97e909411b948 (patch) | |
| tree | e443963b37bbd50a9eff6cd55b23d902db55585a /mbr/gptmbr.S | |
| parent | c7b71e2641e91d8d8c2c818d1108cd35b9b641c3 (diff) | |
| parent | a5fef9bb39d2712e17a9e77644a55bfa6ccdc6c9 (diff) | |
| download | syslinux-37c0cfcc30b5b713e30b5bc741d97e909411b948.tar.gz syslinux-37c0cfcc30b5b713e30b5bc741d97e909411b948.tar.xz syslinux-37c0cfcc30b5b713e30b5bc741d97e909411b948.zip | |
Merge branch 'master' into elflinkelflink
Resolved Conflicts:
NEWS
core/fs/fs.c
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mbr/gptmbr.S')
| -rw-r--r-- | mbr/gptmbr.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mbr/gptmbr.S b/mbr/gptmbr.S index 7f450d30..c1db4e87 100644 --- a/mbr/gptmbr.S +++ b/mbr/gptmbr.S @@ -213,7 +213,7 @@ found_part: movzwl %cx,%eax /* Length of GPT entry */ stosl - + rep; movsb /* GPT entry follows MBR entry */ popw %si |