diff --git a/[refs] b/[refs]
index d76c1f2a6a17..0dcd97a3776b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13febc84849d4f14a088fe3b09111bdb1951ab42
+refs/heads/master: eff8d6447d5fac2995ffa5c1f0ea2da5bd7074c9
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 2f88d8d97701..33614669a9a0 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1897,6 +1897,16 @@ config DEPRECATED_PARAM_STRUCT
 	  This was deprecated in 2001 and announced to live on for 5 years.
 	  Some old boot loaders still use this way.
 
+config XEN_DOM0
+	def_bool y
+	depends on XEN
+
+config XEN
+	bool "Xen guest support on ARM (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && ARM && OF
+	help
+	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
+
 endmenu
 
 menu "Boot options"