]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge mainline into mbivid
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 15 Jan 2010 14:49:28 +0000 (15:49 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 15 Jan 2010 14:49:28 +0000 (15:49 +0100)
1  2 
loader/i386/multiboot.c

Simple merge