diff options
| author | Peter Maydell | 2017-03-31 11:09:42 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-03-31 11:09:42 +0200 |
| commit | a0ee3797bf4917b1b7a4554a4dffbb45f387f087 (patch) | |
| tree | e4e9a419d05c08874dd46e84055e8137b1159a65 /block/commit.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | e1000: disable debug by default (diff) | |
| download | qemu-a0ee3797bf4917b1b7a4554a4dffbb45f387f087.tar.gz qemu-a0ee3797bf4917b1b7a4554a4dffbb45f387f087.tar.xz qemu-a0ee3797bf4917b1b7a4554a4dffbb45f387f087.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 31 Mar 2017 01:50:55 BST
# gpg: using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@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: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
e1000: disable debug by default
virtio-net: avoid call tap_enable when there's only one queue
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/commit.c')
0 files changed, 0 insertions, 0 deletions