merge with mainline

diff --cc commands/acpi.c
Simple merge

diff --cc disk/loopback.c
index 52929e7657e58e8fe438c0aaebbdbb0c94e2e823,509e9e33fc8e07dafd038a932aaefc310d01943a..8153478ed594250b1ee32aca78167eb980528ba7
--- 1/disk/loopback.c
--- 2/disk/loopback.c
+++ b/disk/loopback.c
@@@ -71,11 -71,12 +71,12 @@@ delete_loopback (const char *name
  
  /* The command to add and remove loopback devices.  */
  static grub_err_t
 -grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
 +grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
  {
 -  struct grub_arg_list *state = state = cmd->state;
 +  struct grub_arg_list *state = ctxt->state;
    grub_file_t file;
    struct grub_loopback *newdev;
+   grub_err_t ret;
  
    if (argc < 1)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");