Merge mainline into mbivid
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 15 Sep 2010 22:22:49 +0000 (00:22 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 15 Sep 2010 22:22:49 +0000 (00:22 +0200)
commit9ba27423f56d0c80383a352720fb215cb5bb4e8c
treee47cf31326014ecab6a07ac63baf3cd41ac2ddf6
parentdcc0c5a4434277816eb7bcd1af3575ab17f3763e
parent35139e8a5556a6fb6c79686e6545b80a7370bd4c
Merge mainline into mbivid
21 files changed:
grub-core/commands/handler.c
grub-core/commands/i386/pc/vbeinfo.c
grub-core/commands/i386/pc/vbetest.c
grub-core/efiemu/runtime/efiemu.sh
grub-core/kern/handler.c
grub-core/kern/i386/ieee1275/init.c
grub-core/kern/i386/loader.S
grub-core/kern/i386/misc.S
grub-core/loader/i386/bsd_helper.S
grub-core/loader/i386/bsd_trampoline.S
grub-core/loader/i386/efi/linux.c
grub-core/loader/i386/efi/xnu.c
grub-core/loader/i386/ieee1275/linux.c
grub-core/loader/i386/linux_trampoline.S
grub-core/loader/i386/multiboot_mbi.c
grub-core/loader/i386/pc/xnu.c
grub-core/loader/multiboot.c
grub-core/loader/multiboot_loader.c
grub-core/normal/handler.c
grub-core/term/i386/pc/vesafb.c
include/grub/multiboot.h