merge mainline into mbivid

diff --cc ChangeLog.mbivid
index da4fa3c88fa870f86731269101f9180569390ba0,0000000000000000000000000000000000000000..4720581bea8a21290a2c5070b06c476923006a6a
mode 100644,000000..100644
--- 1/ChangeLog.mbivid
--- /dev/null
+++ b/ChangeLog.mbivid
@@@ -1,24 -1,0 +1,20 @@@
-       * include/grub/video.h (grub_video_driver_id): New type.
-       (grub_video_adapter): New member 'id'. All users updated.
-       (grub_video_get_driver_id): New proto.
 +2010-01-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Video multiboot support.
 +
 +      * include/grub/multiboot.h (grub_multiboot_set_accepts_video):
 +      New prototype.
-       * video/video.c (grub_video_get_driver_id): New function.
 +      * include/multiboot.h: Resynced with multiboot specification.
 +      * include/multiboot2.h: Likewise.
 +      * loader/i386/multiboot.c (UNSUPPORTED_FLAGS): Support video flags.
 +      (grub_multiboot): Parse MULTIBOOT_VIDEO_MODE fields.
 +      * loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): New constant.
 +      (HAS_VGA_TEXT): Likewise.
 +      (HAS_VBE): Likewise.
 +      (accepts_video): New variable.
 +      (grub_multiboot_set_accepts_video): New function.
 +      (grub_multiboot_get_mbi_size): Account for video structures.
 +      (set_video_mode): New function.
 +      (fill_vbe_info) [HAS_VBE]: Likewise.
 +      (retrieve_video_parameters): Likewise.
 +      (grub_multiboot_make_mbi): Fill video fields.