Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
commit169e4878ee96b7d6dec929e0cd400a0395865a85
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 25 Mar 2014 17:49:45 +0000 (25 17:49 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 25 Mar 2014 17:49:46 +0000 (25 17:49 +0000)
tree305698cc0f5b698a5f66e1a28a7dbf8064a94b94
parentd4cc1a213f8cb22fa0861ae2a907c60cf00796ff
parent131e744a15c54f0bad3d3925eeca1acf47996e06
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging

Net patches

# gpg: Signature made Tue 25 Mar 2014 15:02:48 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/net-pull-request:
  net: netmap_poll must update both read/write poll state

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