]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jun 2014 14:00:21 +0000 (15:00 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jun 2014 14:00:21 +0000 (15:00 +0100)
commit4a331bb33bdf112ba95470e5d6ea3561b049c280
tree02ceecff81d33e73b19fd2dc38eb7a8e78a19ea2
parent5dfc05cb1d342f081df7009703559b29dadc33e9
parent7efea763772c815ad6220d5ea7a46447329f6015
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 <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* 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 <peter.maydell@linaro.org>