merge mainline into mbivid

diff --cc ChangeLog.mbivid
index 4720581bea8a21290a2c5070b06c476923006a6a,0000000000000000000000000000000000000000..25db22c1930e44e63f2399ab561c41904adc319e
mode 100644,000000..100644
--- 1/ChangeLog.mbivid
--- /dev/null
+++ b/ChangeLog.mbivid
@@@ -1,20 -1,0 +1,9 @@@
-       Video multiboot support.
 +2010-01-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
-       * include/grub/multiboot.h (grub_multiboot_set_accepts_video):
-       New prototype.
-       * 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.
++      VBE multiboot support.
 +
++      * loader/i386/multiboot_mbi.c (HAS_VBE): New constant.
++      (grub_multiboot_get_mbi_size) [HAS_VBE]: Account for VBE structures.
++      (grub_multiboot_make_mbi) [HAS_VBE]: Likewise.
++      (fill_vbe_info) [HAS_VBE]: New function.
++      (retrieve_video_parameters) [HAS_VBE]: Call fill_vbe_info.