merge mainline into ahci
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 24 Dec 2010 15:16:01 +0000 (16:16 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 24 Dec 2010 15:16:01 +0000 (16:16 +0100)
commitde2690be7c5b017396d73cababee24c5fa8d067d
treec1a135140a24e176305029b2984d0a8ab3f675d5
parentc7336d912c656c4b7c7162e8dee6f5001e732be5
parent5318fe9804f1e95e2d04186f4bf28562c8cfaf5e
merge mainline into ahci
28 files changed:
grub-core/Makefile.core.def
grub-core/commands/crc.c
grub-core/commands/hdparm.c
grub-core/commands/i386/pc/vbeinfo.c
grub-core/commands/i386/pc/vbetest.c
grub-core/disk/ahci.c
grub-core/disk/ata.c
grub-core/disk/pata.c
grub-core/disk/scsi.c
grub-core/disk/usbms.c
grub-core/efiemu/runtime/efiemu.sh
grub-core/gnulib/alloca.h
grub-core/gnulib/argp-version-etc.c
grub-core/gnulib/argp-version-etc.h
grub-core/gnulib/fnmatch.h
grub-core/gnulib/getopt.h
grub-core/kern/disk.c
grub-core/kern/i386/ieee1275/init.c
grub-core/kern/i386/loader.S
grub-core/kern/i386/misc.S
grub-core/lib/crc.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/ieee1275/linux.c
grub-core/loader/i386/linux_trampoline.S
include/grub/disk.h
include/grub/scsi.h