]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Oct 2015 11:13:27 +0000 (12:13 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Oct 2015 11:13:27 +0000 (12:13 +0100)
Xen 2015-10-19

# gpg: Signature made Mon 19 Oct 2015 11:24:05 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/2015-10-19-tag:
  xen-platform: Ensure xen is enabled when initializing
  pc: Require xen when initializing xenfv machine

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge