]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into scrollopt
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 20 Jan 2010 20:38:14 +0000 (21:38 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 20 Jan 2010 20:38:14 +0000 (21:38 +0100)
1  2 
video/fb/video_fb.c

Simple merge