aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-06-27 10:02:52 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-06-27 10:02:52 +0100
commit4515262a97297a9fbb468ab89af745623492cb40 (patch)
tree60dacd045c16fbd4061b44bb1eeda91a67c53133 /Config.mk
parent4cc88b66d746ed98357ee3b01814725d463cf7a2 (diff)
downloadxen-4515262a97297a9fbb468ab89af745623492cb40.tar.gz
xen-4515262a97297a9fbb468ab89af745623492cb40.tar.bz2
xen-4515262a97297a9fbb468ab89af745623492cb40.zip
Update QEMU_TAG for d67e46f6860bfbd8991b7691efc1f67b7bc413bc
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Config.mk b/Config.mk
index a5c2f38bda..912294cd27 100644
--- a/Config.mk
+++ b/Config.mk
@@ -148,9 +148,9 @@ QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= f2e0a24d00b2f0c591719bab088fbe3654955066
-# Thu Jun 18 15:23:53 2009 +0100
-# hw/piix4acpi.c: cleanup logging
+QEMU_TAG ?= d67e46f6860bfbd8991b7691efc1f67b7bc413bc
+# Thu Jun 25 18:40:33 2009 +0100
+# Merge branch 'pt.multifn'
OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg