]> git.proxmox.com Git - grub2.git/commitdiff
merge mainline into net
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 25 Oct 2010 11:19:10 +0000 (13:19 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 25 Oct 2010 11:19:10 +0000 (13:19 +0200)
1  2 
Makefile.util.def
grub-core/Makefile.am
grub-core/Makefile.core.def
grub-core/loader/i386/multiboot_mbi.c
include/grub/disk.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge