]> git.ipfire.org Git - thirdparty/grub.git/commit
merge mainline into hints
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 13 Sep 2010 00:22:10 +0000 (02:22 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 13 Sep 2010 00:22:10 +0000 (02:22 +0200)
commita848c54e341e554cc60fb59df56bdaa6a3a8a8e9
tree6b295cbc1456605c625df990e0a753c14249f0bd
parent7b74857658250b261fa7b89e27c405ceaf95f16e
parentd547dc281c2a383917ce473860a8de04e29886b7
merge mainline into hints
24 files changed:
grub-core/commands/handler.c
grub-core/commands/search.c
grub-core/commands/search_wrap.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/kern/reader.c
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_helper.S
grub-core/loader/i386/pc/multiboot2.c
grub-core/loader/i386/pc/xnu.c
grub-core/loader/ieee1275/multiboot2.c
grub-core/loader/multiboot2.c
grub-core/loader/multiboot_loader.c
grub-core/normal/handler.c
grub-core/normal/menu_viewer.c
grub-core/term/i386/pc/vesafb.c