Merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-06-24 21:22:40 +02:00
commit 2a1d16154d
160 changed files with 6853 additions and 2250 deletions

View file

@ -32,7 +32,7 @@ enum grub_efi_uga_blt_operation
GRUB_EFI_UGA_VIDEO_TO_BLT,
GRUB_EFI_UGA_BLT_TO_VIDEO,
GRUB_EFI_UGA_VIDEO_TO_VIDEO,
GRUB_EFI_UGA_GLT_MAX
GRUB_EFI_UGA_BLT_MAX
};
struct grub_efi_uga_pixel