MErge mainline into intwrap
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 25 Aug 2010 21:39:42 +0000 (23:39 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 25 Aug 2010 21:39:42 +0000 (23:39 +0200)
commitafba9f98ec0701eeaffafbe564761538caaf7cf2
treea3ccf853a8c38b51e9c8574527574365231aaf50
parentb2d8783a98e61edf1573a876ad26fedb26d17aa0
parente35e46fce182084c5719a6e67433f061fa5358b0
MErge mainline into intwrap
30 files changed:
grub-core/Makefile.am
grub-core/Makefile.core.def
grub-core/commands/handler.c
grub-core/commands/i386/pc/halt.c
grub-core/disk/i386/pc/biosdisk.c
grub-core/fs/i386/pc/pxe.c
grub-core/kern/efi/efi.c
grub-core/kern/emu/main.c
grub-core/kern/handler.c
grub-core/kern/i386/coreboot/init.c
grub-core/kern/i386/loader.S
grub-core/kern/i386/pc/init.c
grub-core/kern/i386/pc/mmap.c
grub-core/kern/i386/pc/startup.S
grub-core/kern/i386/qemu/mmap.c
grub-core/kern/i386/qemu/startup.S
grub-core/kern/ieee1275/openfw.c
grub-core/lib/efi/halt.c
grub-core/lib/i386/halt.c
grub-core/lib/ieee1275/halt.c
grub-core/loader/i386/bsd.c
grub-core/loader/i386/efi/xnu.c
grub-core/loader/i386/pc/xnu.c
grub-core/normal/handler.c
grub-core/video/i386/pc/vbe.c
grub-core/video/i386/pc/vga.c
include/grub/i386/multiboot/init.h
include/grub/i386/qemu/init.h
include/grub/mips/yeeloong/kernel.h
include/grub/misc.h