Merge mainline into newreloc

loader/i386/bsd.c

@@ -807,6 +807,7 @@ grub_openbsd_boot (void)
   pa = pa->ba_next;
   pa->ba_type = OPENBSD_BOOTARG_END;
   pa++;
+
   buf = (grub_uint8_t *) pa;
   argbuf_target_end = buf - buf0 + buf_target;
 

loader/i386/multiboot_mbi.c

@@ -239,6 +239,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
   grub_size_t mmap_size;
   grub_uint8_t *ptrorig; 
   grub_addr_t ptrdest;
+
   grub_err_t err;
   grub_size_t bufsize;
 

loader/i386/pc/linux.c

@@ -64,7 +64,6 @@ grub_linux16_boot (void)
   return grub_relocator16_boot (relocator, state);
 }
 
-
 static grub_err_t
 grub_linux_unload (void)
 {