From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 17 Sep 2015 12:07:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Tag: v2.5.0-rc0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc450bfdc030d1943d99b3cb526a3e2cb4f3cd72;p=thirdparty%2Fqemu.git

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

# gpg: Signature made Thu 17 Sep 2015 12:43:56 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:
  net: smc91c111: flush packets on RCR register changes
  net: smc91c111: gate can_receive() on rx FIFO having a slot
  net: smc91c111: guard flush_queued_packets() on can_rx()
  MAINTAINERS: Stefan will not maintain net subsystem

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

cc450bfdc030d1943d99b3cb526a3e2cb4f3cd72