diff options
| author | Peter Maydell | 2015-10-19 13:13:27 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-10-19 13:13:27 +0200 |
| commit | 26c7be842637ee65a79cd77f96a99c23ddcd90ad (patch) | |
| tree | 8820d011cadf9ed24abf3472ccd9ddcb6805fd3a /net/net.c | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | xen-platform: Ensure xen is enabled when initializing (diff) | |
| download | qemu-26c7be842637ee65a79cd77f96a99c23ddcd90ad.tar.gz qemu-26c7be842637ee65a79cd77f96a99c23ddcd90ad.tar.xz qemu-26c7be842637ee65a79cd77f96a99c23ddcd90ad.zip | |
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>
Diffstat (limited to 'net/net.c')
0 files changed, 0 insertions, 0 deletions