Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging master
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 28 Jul 2015 18:02:04 +0000 (19:02 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 28 Jul 2015 18:02:04 +0000 (19:02 +0100)
commitb83d017d88b2c4710c7a4614ecf9f845e4db80ba
tree5e9970d48e537674d1b8d163a5ce7e74c6082fcb
parent170f209d7848dc2f14b3f3dccc34a49558680d4d
parent7bba83bf80eae9c9e323319ff40d0ca477b0a77a
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>