vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge mainline into cirrus

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-06-21 02:15:49 +02:00
commit 8e50ec9f05
235 changed files with 8914 additions and 15402 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boot/i386/qemu/boot.S
View file

@ -31,7 +31,7 @@ _start:
jmp 1f
. = _start + GRUB_BOOT_MACHINE_CORE_ENTRY_ADDR
. = _start + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
VARIABLE(grub_core_entry_addr)
.long 0
1: