Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into staging
commit26c7be842637ee65a79cd77f96a99c23ddcd90ad
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Oct 2015 11:13:27 +0000 (19 12:13 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Oct 2015 11:13:27 +0000 (19 12:13 +0100)
tree8820d011cadf9ed24abf3472ccd9ddcb6805fd3a
parent526d5809a0714edc7f19196f14ec2e607dbd9753
parentdbb7405d8caad0814ceddd568cb49f163a847561
Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into staging

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>