From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 25 Nov 2013 12:02:27 +0000 (+0100)
Subject: Merge branch 'master' into leiflindholm/arm64
X-Git-Tag: grub-2.02-beta1~180^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c92cdc344bcb52543edadb2c52cb9526434caa;p=thirdparty%2Fgrub.git

Merge branch 'master' into leiflindholm/arm64

Conflicts:
	include/grub/util/install.h
---

d6c92cdc344bcb52543edadb2c52cb9526434caa
diff --cc include/grub/util/install.h
index 0aead0a8a,1b1ccd027..744e2f4e8
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@@ -87,7 -87,8 +87,9 @@@ enum grub_install_pla
      GRUB_INSTALL_PLATFORM_ARM_EFI,
      GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS,
      GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS,
+     GRUB_INSTALL_PLATFORM_I386_XEN,
+     GRUB_INSTALL_PLATFORM_X86_64_XEN,
 +    GRUB_INSTALL_PLATFORM_ARM64_EFI,
      GRUB_INSTALL_PLATFORM_MAX
    };