diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-04 11:44:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-04 11:44:32 +0100 |
| commit | 6fa6b312765f698dc81b2c30e7eeb9683804a05b (patch) | |
| tree | 5d61ddafddac3c77c702b568c70040c3840fbe19 /hw/net/virtio-net.c | |
| parent | d2ceeb1d68ed8b005892408fcdb533f578aae081 (diff) | |
| parent | 1b93c9a1040b3c12320cf55c6284882a2e6e8ff3 (diff) | |
| download | focaccia-qemu-6fa6b312765f698dc81b2c30e7eeb9683804a05b.tar.gz focaccia-qemu-6fa6b312765f698dc81b2c30e7eeb9683804a05b.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue 2015-06-02 # gpg: Signature made Tue Jun 2 20:21:17 2015 BST using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-pull-request: arch_init: Drop target-x86_64.conf target-i386: Register QOM properties for feature flags apic: convert ->busdev.qdev casts to C casts target-i386: Fix signedness of MSR_IA32_APICBASE_BASE pc: Ensure non-zero CPU ref count after attaching to ICC bus Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions