]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into videomask
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 16 Dec 2009 16:52:17 +0000 (17:52 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 16 Dec 2009 16:52:17 +0000 (17:52 +0100)
1  2 
loader/i386/linux.c

Simple merge