From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 28 Jul 2015 18:02:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Tag: v2.4.0-rc3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b83d017d88b2c4710c7a4614ecf9f845e4db80ba;p=thirdparty%2Fqemu.git

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

Pull request

These two .can_receive() are now reviewed.  The net subsystem queue for 2.4 is now empty.

# gpg: Signature made Tue Jul 28 13:26:03 2015 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:
  xen: Drop net_rx_ok
  hw/net: handle flow control in mcf_fec driver receiver

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

b83d017d88b2c4710c7a4614ecf9f845e4db80ba