From 4f361248f6ac7aaa37d4fe4c69b8605c235317e8 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir@xen.org>
Date: Wed, 8 Aug 2012 18:02:21 +0100
Subject: Update Xen version to 4.2.0-rc2

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

diff --git a/Config.mk b/Config.mk
index 89b5adcbc2..f3f1b7910f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -213,7 +213,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
 # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG ?= d94efd9aa814f17f3243dae91476dc42b5ad052e
+QEMU_TAG ?= xen-4.2.0-rc2
 # Tue Aug 7 18:17:27 2012 +0100
 # mapcache: Fix invalidate if memory requested was not bucket aligned
 
diff --git a/xen/Makefile b/xen/Makefile
index f6cbb9a583..c8cddea391 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    = 2
-export XEN_EXTRAVERSION ?= .0-rc2-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc2$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version
 
-- 
cgit v1.2.3