]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge mainline into mbtag
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 27 Mar 2010 21:14:41 +0000 (22:14 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 27 Mar 2010 21:14:41 +0000 (22:14 +0100)
1  2 
conf/i386.rmk
loader/i386/multiboot_mbi.c

diff --cc conf/i386.rmk
Simple merge
Simple merge