projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28b9d47 594278d)
Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Mon, 30 Sep 2013 22:14:10 +0000 (17:14 -0500)
committerAnthony Liguori <anthony@codemonkey.ws>
Mon, 30 Sep 2013 22:14:10 +0000 (17:14 -0500)
# 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.