From 224775a2dc8a7005f3fe793f6f8294bda675a5be Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir@xen.org>
Date: Mon, 7 May 2012 13:45:31 +0100
Subject: Update Xen version to 4.0.4-rc1

---
 Config.mk    | 2 +-
 xen/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config.mk b/Config.mk
index a037116293..01965b056f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -178,7 +178,7 @@ endif
 # CONFIG_QEMU ?= ../qemu-xen.git
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG := 36984c285a765541b04f378bfa84d2c850c167d3
+QEMU_TAG := xen-4.0.4-rc1
 # Thu Feb 2 13:47:06 2012 +0000
 # e1000: bounds packet size against buffer size
 
diff --git a/xen/Makefile b/xen/Makefile
index e39d997946..beb612cd2e 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 0
-export XEN_EXTRAVERSION ?= .4-rc1-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version
 
-- 
cgit v1.2.3