Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 17 Sep 2015 12:07:50 +0000 (13:07 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 17 Sep 2015 12:07:50 +0000 (13:07 +0100)
commitcc450bfdc030d1943d99b3cb526a3e2cb4f3cd72
tree63f9341b8527f97df640d86ed8ea371f3c21e8b2
parent1c9f03b81ce9136cf1bd3c111582b320b507dfec
parent271a234a2359975101396916f37f3c7d347c61b8
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>