From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 14 Aug 2015 17:06:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97;p=qemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging

# gpg: Signature made Fri 14 Aug 2015 16:01:19 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  tests: test rx recovery from cont
  tests: introduce basic pci test for virtio-net
  net/vmxnet3: Fix incorrect debug message

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97