merge with mainline

grub-core/kern/efi/init.c

@@ -36,6 +36,9 @@ grub_efi_init (void)
   /* Initialize the memory management system.  */
   grub_efi_mm_init ();
 
+  efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer,
+	      0, 0, 0, NULL);
+
   grub_efidisk_init ();
 }