Merge mainline into net
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 22 Sep 2010 18:13:00 +0000 (20:13 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 22 Sep 2010 18:13:00 +0000 (20:13 +0200)
commit760a7e5aed711c59e6d124dc3a8a7ce03d87865b
tree0d6de7a3f2710f3c138557218056e58965a1f6e4
parent90451bb1c951bbc90f479084b28ddb1e09d8ac8d
parent7835dfd3e838160d8169ae5771368b615eefeca9
Merge mainline into net
12 files changed:
Makefile.util.def
grub-core/Makefile.am
grub-core/Makefile.core.def
grub-core/commands/ls.c
grub-core/commands/probe.c
grub-core/kern/device.c
grub-core/kern/ieee1275/openfw.c
grub-core/loader/i386/multiboot_mbi.c
grub-core/net/i386/pc/pxe.c
include/grub/disk.h
include/grub/err.h
include/grub/ieee1275/ieee1275.h