diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-25 15:23:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-25 15:23:08 +0000 |
| commit | d4cc1a213f8cb22fa0861ae2a907c60cf00796ff (patch) | |
| tree | 80ea19c13fa7c1cee21854bc1b96fdbf30fd25ac /hw/net/virtio-net.c | |
| parent | 839a5547574e57cce62f49bfc50fe1f04b00589a (diff) | |
| parent | 7b770c720b28b8ac5b82ae431f2f354b7f8add91 (diff) | |
| download | focaccia-qemu-d4cc1a213f8cb22fa0861ae2a907c60cf00796ff.tar.gz focaccia-qemu-d4cc1a213f8cb22fa0861ae2a907c60cf00796ff.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Block pull request # gpg: Signature made Tue 25 Mar 2014 14:34:45 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: mirror: fix early wake from sleep due to aio mirror: fix throttling delay calculation Fixed various typos qemu-img: mandate argument to 'qemu-img check --repair' osdep: initialize glib threads in all QEMU tools Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions