Merge mainline.
authorManoel Rebelo Abranches <mrabran@br.ibm.com>
Thu, 5 May 2011 15:12:22 +0000 (12:12 -0300)
committerManoel Rebelo Abranches <mrabran@br.ibm.com>
Thu, 5 May 2011 15:12:22 +0000 (12:12 -0300)
commit90eb90e24c5fc37d61b4535a7a242c28e6eb0de5
tree390820d696a2ebe0484111dfc301384221aa82c7
parentecb2a8b6567dd8f1263e5308b32596b35186df53
parent072b5d315af49fc0ff4c6e31bc4f3a8f9e8a58ef
Merge mainline.
Makefile.util.def
grub-core/Makefile.core.def
grub-core/commands/ls.c
grub-core/commands/probe.c
grub-core/kern/file.c
grub-core/loader/i386/multiboot_mbi.c
include/grub/err.h