From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 18 Aug 2016 09:56:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5844365fe8e5e4598222d276d2af54fd45c7e3d3;p=qemu.git

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

# gpg: Signature made Thu 18 Aug 2016 06:36:16 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:
  net/net: properly handle multiple packets in net_fill_rstate()
  net: vmxnet: use g_new for pkt initialisation

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

5844365fe8e5e4598222d276d2af54fd45c7e3d3