| commit | 6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 14 Aug 2015 17:06:44 +0000 (14 18:06 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 14 Aug 2015 17:06:44 +0000 (14 18:06 +0100) | ||
| tree | 0dcdd090696a104284db8bcc28acc94410383eec | treesnapshot (tar.gz zip) |
| parent | 074a9925e1cfd659d5376dcaccd1436d3840e611 | commitdiff |
| parent | 8887f84c54f6e74124544d1700a205e5b6821b3d | commitdiff |
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>
# 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>