summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-08-18 10:56:40 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-08-18 10:56:41 +0100
commit5844365fe8e5e4598222d276d2af54fd45c7e3d3 (patch)
tree19001993b6377443c5efcebf17064d2685cf3543 /block
parent4b887ae65880bf7eae53ba8af40599581fe759e5 (diff)
parente9e0a5854b6dc888f44e7e280a007326714199a6 (diff)
downloadqemu-5844365fe8e5e4598222d276d2af54fd45c7e3d3.tar.gz
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>
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions