From: Peter Maydell Date: Mon, 9 Jun 2014 14:00:21 +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=4a331bb33bdf112ba95470e5d6ea3561b049c280;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging Net patches # gpg: Signature made Mon 09 Jun 2014 14:41:34 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/net-pull-request: e1000: remove broken support for 82573L tests: e1000: test additional device IDs e1000: allow command-line selection of card model vmxnet3: fix msix vectors unuse net: xilinx_ethlite: Fix Rx-pong interrupt Signed-off-by: Peter Maydell --- 4a331bb33bdf112ba95470e5d6ea3561b049c280