From: Peter Maydell Date: Tue, 14 Mar 2017 11:15:00 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Tag: qemu-xen-4.10.0-rc1~422 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=591bce29b10a957a5cad4354cd5959c45570aedb;p=qemu-xen.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Tue 14 Mar 2017 07:55:01 GMT # gpg: using RSA key 0xEF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) " # 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: hw/net: implement MIB counters in mcf_fec driver COLO-compare: Fix trace_event print bug e1000e: correctly tear down MSI-X memory regions Signed-off-by: Peter Maydell --- 591bce29b10a957a5cad4354cd5959c45570aedb