From: Anthony Liguori <anthony@codemonkey.ws>
Date: Mon, 30 Sep 2013 22:14:10 +0000 (-0500)
Subject: Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~444
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3469a60d9f6f7ba6fca3fe0788391f7285ead631;p=qemu-xen.git

Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging

# By Anthony PERARD (2) and Liu, Jinsong (2)
# Via Stefano Stabellini
* sstabellini/xen-2013-09-25:
  xen: Enable cpu-hotplug on xenfv machine.
  xen: Fix vcpu initialization.
  qemu: Add qemu xen logic for Xen HVM S3 resume
  qemu: Adjust qemu wakeup

Message-id: alpine.DEB.2.02.1309251749180.5498@kaball.uk.xensource.com
---

3469a60d9f6f7ba6fca3fe0788391f7285ead631