merge mainline into ia64
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 31 Aug 2010 19:47:26 +0000 (21:47 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 31 Aug 2010 19:47:26 +0000 (21:47 +0200)
commit6585de4c0ce342ed3209488c077e3882a4aba384
tree98339fce4fc870e61faf637d54233976a2337282
parentc72c93c7d4cbf625eb8c2ff29f4b584690188fd1
parent21ed554bb036be72bd3ec1b377578cd079d36dc4
merge mainline into ia64
36 files changed:
Makefile.util.def
configure.ac
gentpl.py
grub-core/Makefile.am
grub-core/Makefile.core.def
grub-core/commands/efi/acpi2.c
grub-core/commands/efi/memmap.c
grub-core/commands/efi/systab.c
grub-core/commands/handler.c
grub-core/efiemu/runtime/efiemu.sh
grub-core/kern/dl.c
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/ia64/efi/elf_ia64_efi.lds
grub-core/kern/ia64/efi/init.c
grub-core/kern/ia64/efi/startup.S
grub-core/kern/ia64/trampoline.S
grub-core/kern/main.c
grub-core/kern/mm.c
grub-core/lib/ia64/longjmp.S
grub-core/lib/ia64/setjmp.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/pc/xnu.c
grub-core/loader/ia64/efi/linux.c
grub-core/loader/multiboot_loader.c
grub-core/normal/handler.c
grub-core/term/i386/pc/vesafb.c
include/grub/dl.h
include/grub/efi/efi.h