Merge mainline.

grub-core/term/at_keyboard.c

@@ -26,6 +26,8 @@
 #include <grub/time.h>
 #include <grub/loader.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 static short at_keyboard_status = 0;
 static int e0_received = 0;
 static int f0_received = 0;

grub-core/term/gfxterm.c

@@ -31,6 +31,8 @@
 #include <grub/bitmap_scale.h>
 #include <grub/i18n.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 #define DEFAULT_VIDEO_MODE	"auto"
 #define DEFAULT_BORDER_WIDTH	10
 
@@ -343,7 +345,6 @@ grub_gfxterm_fullscreen (void)
       grub_video_swap_buffers ();
       grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
     }
-  bitmap = 0;
 
   /* Select the font to use.  */
   font_name = grub_env_get ("gfxterm_font");
@@ -392,12 +393,6 @@ grub_gfxterm_term_init (struct grub_term_output *term __attribute__ ((unused)))
 static void
 destroy_window (void)
 {
-  if (bitmap)
-    {
-      grub_video_bitmap_destroy (bitmap);
-      bitmap = 0;
-    }
-
   repaint_callback = 0;
   grub_virtual_screen_free ();
 }

grub-core/term/i386/pc/vga_text.c

@@ -22,6 +22,8 @@
 #include <grub/types.h>
 #include <grub/vga.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 #define COLS	80
 #define ROWS	25
 

grub-core/term/serial.c

@@ -27,6 +27,8 @@
 #include <grub/i18n.h>
 #include <grub/list.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 #define FOR_SERIAL_PORTS(var) FOR_LIST_ELEMENTS((var), (grub_serial_ports))
 
 /* Argument options.  */

grub-core/term/terminfo.c

@@ -34,6 +34,8 @@
 #include <grub/i18n.h>
 #include <grub/time.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 static struct grub_term_output *terminfo_outputs;
 
 /* Get current terminfo name.  */

grub-core/term/usb_keyboard.c

@@ -27,6 +27,8 @@
 #include <grub/time.h>
 #include <grub/keyboard_layouts.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 
 
 enum